diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-01-06 09:04:32 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-01-06 09:04:32 +0100 |
commit | d12418fdeafdc08dd5bbec89d3e07e47ee75da55 (patch) | |
tree | ac94d5bf58360b89fc7439fb52182c17d0674b0a /fs/ecryptfs/mmap.c | |
parent | c2d1cec1c77f7714672c1efeae075424c929e0d5 (diff) | |
parent | 238c6d54830c624f34ac9cf123ac04aebfca5013 (diff) |
Merge branch 'linus' into cpus4096
Diffstat (limited to 'fs/ecryptfs/mmap.c')
-rw-r--r-- | fs/ecryptfs/mmap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ecryptfs/mmap.c b/fs/ecryptfs/mmap.c index 04d7b3fa1ac..46cec2b6979 100644 --- a/fs/ecryptfs/mmap.c +++ b/fs/ecryptfs/mmap.c @@ -288,7 +288,7 @@ static int ecryptfs_write_begin(struct file *file, loff_t prev_page_end_size; int rc = 0; - page = __grab_cache_page(mapping, index); + page = grab_cache_page_write_begin(mapping, index, flags); if (!page) return -ENOMEM; *pagep = page; |