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/ext4/inode.c | |
| parent | 8916edef5888c5d8fe283714416a9ca95b4c3431 (diff) | |
| parent | fe0bdec68b77020281dc814805edfe594ae89e0f (diff) | |
Merge branch 'linus' into sched/urgent
Diffstat (limited to 'fs/ext4/inode.c')
| -rw-r--r-- | fs/ext4/inode.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index 7c3325e0b005..6702a49992a6 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c | |||
| @@ -1346,7 +1346,7 @@ retry: | |||
| 1346 | goto out; | 1346 | goto out; |
| 1347 | } | 1347 | } |
| 1348 | 1348 | ||
| 1349 | page = __grab_cache_page(mapping, index); | 1349 | page = grab_cache_page_write_begin(mapping, index, flags); |
| 1350 | if (!page) { | 1350 | if (!page) { |
| 1351 | ext4_journal_stop(handle); | 1351 | ext4_journal_stop(handle); |
| 1352 | ret = -ENOMEM; | 1352 | ret = -ENOMEM; |
| @@ -2550,7 +2550,7 @@ retry: | |||
| 2550 | goto out; | 2550 | goto out; |
| 2551 | } | 2551 | } |
| 2552 | 2552 | ||
| 2553 | page = __grab_cache_page(mapping, index); | 2553 | page = grab_cache_page_write_begin(mapping, index, flags); |
| 2554 | if (!page) { | 2554 | if (!page) { |
| 2555 | ext4_journal_stop(handle); | 2555 | ext4_journal_stop(handle); |
| 2556 | ret = -ENOMEM; | 2556 | ret = -ENOMEM; |