From mboxrd@z Thu Jan 1 00:00:00 1970 From: Nate Diller Subject: [PATCH 6/13] gfs2: use zero_user_page Date: Tue, 10 Apr 2007 20:36:00 -0700 Message-ID: <20070411033600.11000.71629.patchbomb.py@localhost> References: <20070411033600.11000.38285.patchbomb.py@localhost> Cc: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org To: Andrew Morton , Alexander Viro Return-path: Received: from py-out-1112.google.com ([64.233.166.179]:15870 "EHLO py-out-1112.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753944AbXDKDif (ORCPT ); Tue, 10 Apr 2007 23:38:35 -0400 Received: by py-out-1112.google.com with SMTP id a29so46480pyi for ; Tue, 10 Apr 2007 20:38:35 -0700 (PDT) In-Reply-To: <20070411033600.11000.38285.patchbomb.py@localhost> Sender: linux-fsdevel-owner@vger.kernel.org List-Id: linux-fsdevel.vger.kernel.org Use zero_user_page() instead of open-coding it. Signed-off-by: Nate Diller --- diff -urpN -X dontdiff linux-2.6.21-rc6-mm1/fs/gfs2/bmap.c linux-2.6.21-rc6-mm1-test/fs/gfs2/bmap.c --- linux-2.6.21-rc6-mm1/fs/gfs2/bmap.c 2007-04-09 17:23:48.000000000 -0700 +++ linux-2.6.21-rc6-mm1-test/fs/gfs2/bmap.c 2007-04-09 18:18:23.000000000 -0700 @@ -885,7 +885,6 @@ static int gfs2_block_truncate_page(stru unsigned blocksize, iblock, length, pos; struct buffer_head *bh; struct page *page; - void *kaddr; int err; page = grab_cache_page(mapping, index); @@ -933,10 +932,7 @@ static int gfs2_block_truncate_page(stru if (sdp->sd_args.ar_data == GFS2_DATA_ORDERED || gfs2_is_jdata(ip)) gfs2_trans_add_bh(ip->i_gl, bh, 0); - kaddr = kmap_atomic(page, KM_USER0); - memset(kaddr + offset, 0, length); - flush_dcache_page(page); - kunmap_atomic(kaddr, KM_USER0); + zero_user_page(page, offset, length); unlock: unlock_page(page);