From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755418Ab1K0FfP (ORCPT ); Sun, 27 Nov 2011 00:35:15 -0500 Received: from mx1.redhat.com ([209.132.183.28]:1880 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755228Ab1K0FfK (ORCPT ); Sun, 27 Nov 2011 00:35:10 -0500 From: Cong Wang To: linux-kernel@vger.kernel.org Cc: akpm@linux-foundation.org, Cong Wang , Miklos Szeredi , fuse-devel@lists.sourceforge.net Subject: [PATCH 35/62] fuse: remove the second argument of k[un]map_atomic() Date: Sun, 27 Nov 2011 13:27:15 +0800 Message-Id: <1322371662-26166-36-git-send-email-amwang@redhat.com> In-Reply-To: <1322371662-26166-1-git-send-email-amwang@redhat.com> References: <1322371662-26166-1-git-send-email-amwang@redhat.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Signed-off-by: Cong Wang --- fs/fuse/dev.c | 4 ++-- fs/fuse/file.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c index 5cb8614..1d8a4cf 100644 --- a/fs/fuse/dev.c +++ b/fs/fuse/dev.c @@ -838,10 +838,10 @@ static int fuse_copy_page(struct fuse_copy_state *cs, struct page **pagep, } } if (page) { - void *mapaddr = kmap_atomic(page, KM_USER0); + void *mapaddr = kmap_atomic(page); void *buf = mapaddr + offset; offset += fuse_copy_do(cs, &buf, &count); - kunmap_atomic(mapaddr, KM_USER0); + kunmap_atomic(mapaddr); } else offset += fuse_copy_do(cs, NULL, &count); } diff --git a/fs/fuse/file.c b/fs/fuse/file.c index 594f07a..a8aabde 100644 --- a/fs/fuse/file.c +++ b/fs/fuse/file.c @@ -1915,11 +1915,11 @@ long fuse_do_ioctl(struct file *file, unsigned int cmd, unsigned long arg, in_iovs + out_iovs > FUSE_IOCTL_MAX_IOV) goto out; - vaddr = kmap_atomic(pages[0], KM_USER0); + vaddr = kmap_atomic(pages[0]); err = fuse_copy_ioctl_iovec(fc, iov_page, vaddr, transferred, in_iovs + out_iovs, (flags & FUSE_IOCTL_COMPAT) != 0); - kunmap_atomic(vaddr, KM_USER0); + kunmap_atomic(vaddr); if (err) goto out; -- 1.7.4.4