diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-05 07:53:39 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-05 07:53:39 -0500 |
| commit | 5359c32eb7402124abc9964d5d53639fe0739cea (patch) | |
| tree | d77b6967fe8420678bb9d1d936855ac0699c196a /fs/ecryptfs/mmap.c | |
| parent | 8916edef5888c5d8fe283714416a9ca95b4c3431 (diff) | |
| parent | fe0bdec68b77020281dc814805edfe594ae89e0f (diff) | |
Merge branch 'linus' into sched/urgent
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 04d7b3fa1ac6..46cec2b69796 100644 --- a/fs/ecryptfs/mmap.c +++ b/fs/ecryptfs/mmap.c | |||
| @@ -288,7 +288,7 @@ static int ecryptfs_write_begin(struct file *file, | |||
| 288 | loff_t prev_page_end_size; | 288 | loff_t prev_page_end_size; |
| 289 | int rc = 0; | 289 | int rc = 0; |
| 290 | 290 | ||
| 291 | page = __grab_cache_page(mapping, index); | 291 | page = grab_cache_page_write_begin(mapping, index, flags); |
| 292 | if (!page) | 292 | if (!page) |
| 293 | return -ENOMEM; | 293 | return -ENOMEM; |
| 294 | *pagep = page; | 294 | *pagep = page; |