diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2014-08-28 22:34:57 +0400 |
|---|---|---|
| committer | Jiri Slaby <jslaby@suse.cz> | 2014-09-26 13:51:58 +0400 |
| commit | 72ef5b50e048aae663fe9b8a3702646a773ea414 (patch) | |
| tree | dd95550583d2c1ffc1e67bd644bad655ba1c211e /fs/btrfs/file.c | |
| parent | 4fb08e5ab578244164bd2269bd0d5d14669ed35a (diff) | |
| download | linux-72ef5b50e048aae663fe9b8a3702646a773ea414.tar.xz | |
callers of iov_copy_from_user_atomic() don't need pagecache_disable()
commit 9e8c2af96e0d2d5fe298dd796fb6bc16e888a48d upstream.
... it does that itself (via kmap_atomic())
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Mel Gorman <mgorman@suse.de>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Diffstat (limited to 'fs/btrfs/file.c')
| -rw-r--r-- | fs/btrfs/file.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c index 72da4df53c9a..9952a2a68fda 100644 --- a/fs/btrfs/file.c +++ b/fs/btrfs/file.c @@ -426,13 +426,8 @@ static noinline int btrfs_copy_from_user(loff_t pos, int num_pages, struct page *page = prepared_pages[pg]; /* * Copy data from userspace to the current page - * - * Disable pagefault to avoid recursive lock since - * the pages are already locked */ - pagefault_disable(); copied = iov_iter_copy_from_user_atomic(page, i, offset, count); - pagefault_enable(); /* Flush processor's dcache for this page */ flush_dcache_page(page); |