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/gfs2/ops_address.c | |
| parent | 8916edef5888c5d8fe283714416a9ca95b4c3431 (diff) | |
| parent | fe0bdec68b77020281dc814805edfe594ae89e0f (diff) | |
Merge branch 'linus' into sched/urgent
Diffstat (limited to 'fs/gfs2/ops_address.c')
| -rw-r--r-- | fs/gfs2/ops_address.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/gfs2/ops_address.c b/fs/gfs2/ops_address.c index 27563816e1c5..15f710f2d4da 100644 --- a/fs/gfs2/ops_address.c +++ b/fs/gfs2/ops_address.c | |||
| @@ -675,7 +675,7 @@ static int gfs2_write_begin(struct file *file, struct address_space *mapping, | |||
| 675 | goto out_trans_fail; | 675 | goto out_trans_fail; |
| 676 | 676 | ||
| 677 | error = -ENOMEM; | 677 | error = -ENOMEM; |
| 678 | page = __grab_cache_page(mapping, index); | 678 | page = grab_cache_page_write_begin(mapping, index, flags); |
| 679 | *pagep = page; | 679 | *pagep = page; |
| 680 | if (unlikely(!page)) | 680 | if (unlikely(!page)) |
| 681 | goto out_endtrans; | 681 | goto out_endtrans; |