diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-03 14:40:10 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-03 14:40:10 -0700 |
| commit | 3a09b1be53d23df780a0cd0e4087a05e2ca4a00c (patch) | |
| tree | 16c4ee5593847cc96e44e95f94e3ca0e315dfb1d /fs/gfs2/aops.c | |
| parent | 7046e668d7973c470146fbe6635967a1b4a31bca (diff) | |
| parent | 0809f6ec18bbce54c996f5c36f4b9d371075c98b (diff) | |
| download | op-kernel-dev-3a09b1be53d23df780a0cd0e4087a05e2ca4a00c.zip op-kernel-dev-3a09b1be53d23df780a0cd0e4087a05e2ca4a00c.tar.gz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw
* git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw:
GFS2: Fix recovery stuck bug (try #2)
GFS2: Fix typo in stuffed file data copy handling
Revert "GFS2: recovery stuck on transaction lock"
GFS2: Make "try" lock not try quite so hard
GFS2: remove dependency on __GFP_NOFAIL
GFS2: Simplify gfs2_write_alloc_required
GFS2: Wait for journal id on mount if not specified on mount command line
GFS2: Use nobh_writepage
Diffstat (limited to 'fs/gfs2/aops.c')
| -rw-r--r-- | fs/gfs2/aops.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/fs/gfs2/aops.c b/fs/gfs2/aops.c index 9f8b525..5e96cbd 100644 --- a/fs/gfs2/aops.c +++ b/fs/gfs2/aops.c @@ -136,10 +136,7 @@ static int gfs2_writeback_writepage(struct page *page, if (ret <= 0) return ret; - ret = mpage_writepage(page, gfs2_get_block_noalloc, wbc); - if (ret == -EAGAIN) - ret = block_write_full_page(page, gfs2_get_block_noalloc, wbc); - return ret; + return nobh_writepage(page, gfs2_get_block_noalloc, wbc); } /** @@ -637,9 +634,7 @@ static int gfs2_write_begin(struct file *file, struct address_space *mapping, } } - error = gfs2_write_alloc_required(ip, pos, len, &alloc_required); - if (error) - goto out_unlock; + alloc_required = gfs2_write_alloc_required(ip, pos, len); if (alloc_required || gfs2_is_jdata(ip)) gfs2_write_calc_reserv(ip, len, &data_blocks, &ind_blocks); |
