Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755406AbaJNRqX (ORCPT ); Tue, 14 Oct 2014 13:46:23 -0400 Received: from mailrelay001.isp.belgacom.be ([195.238.6.51]:35550 "EHLO mailrelay001.isp.belgacom.be" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755369AbaJNRqW (ORCPT ); Tue, 14 Oct 2014 13:46:22 -0400 X-Belgacom-Dynamic: yes X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: AskNAHZgPVRbtAZ+/2dsb2JhbABbgw6BK7h2BQFzmhaBFhcBfYQwLyOBGjeIQgG3Z48bLIYgiiUdhDUFmH2EToxciTWBRwGCMTsvgkoBAQE From: Fabian Frederick To: linux-kernel@vger.kernel.org Cc: Fabian Frederick , Chris Mason , Josef Bacik , linux-btrfs@vger.kernel.org Subject: [RFC 1/1 linux-next] btrfs: don't opencode zero_user_segment Date: Tue, 14 Oct 2014 19:46:14 +0200 Message-Id: <1413308774-9985-1-git-send-email-fabf@skynet.be> X-Mailer: git-send-email 1.9.3 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org use function defined in include/linux/highmem.h Note that this reverts 2 last function call order Signed-off-by: Fabian Frederick --- fs/btrfs/scrub.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/fs/btrfs/scrub.c b/fs/btrfs/scrub.c index efa0831..fa063cd 100644 --- a/fs/btrfs/scrub.c +++ b/fs/btrfs/scrub.c @@ -1503,13 +1503,9 @@ static int scrub_write_page_to_dev_replace(struct scrub_block *sblock, struct scrub_page *spage = sblock->pagev[page_num]; BUG_ON(spage->page == NULL); - if (spage->io_error) { - void *mapped_buffer = kmap_atomic(spage->page); + if (spage->io_error) + zero_user_segment(spage->page, 0, PAGE_CACHE_SIZE); - memset(mapped_buffer, 0, PAGE_CACHE_SIZE); - flush_dcache_page(spage->page); - kunmap_atomic(mapped_buffer); - } return scrub_add_page_to_wr_bio(sblock->sctx, spage); } -- 1.9.3 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/