diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2009-03-09 10:03:51 +0100 |
|---|---|---|
| committer | Steven Whitehouse <steve@dolmen.chygwyn.com> | 2009-03-24 12:21:27 +0100 |
| commit | 6bac243f0793499782267342eba852a8a6cc7ac4 (patch) | |
| tree | 8cf9bb9fa54767c6207bc7f72d75364c290702d9 /fs/gfs2/ops_file.c | |
| parent | GFS2: Fix locking bug in failed shared to exclusive conversion (diff) | |
| download | linux-6bac243f0793499782267342eba852a8a6cc7ac4.tar.xz linux-6bac243f0793499782267342eba852a8a6cc7ac4.zip | |
GFS2: Clean up of glops.c
This cleans up a number of bits of code mostly based in glops.c.
A couple of simple functions have been merged into the callers
to make it more obvious what is going on, the mysterious raising
of i_writecount around the truncate_inode_pages() call has been
removed. The meta_go_* operations have been renamed rgrp_go_*
since that is the only lock type that they are used with.
The unused argument of gfs2_read_sb has been removed. Also
a bug has been fixed where a check for the rindex inode was
in the wrong callback. More comments are added, and the
debugging code is improved too.
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
Diffstat (limited to 'fs/gfs2/ops_file.c')
| -rw-r--r-- | fs/gfs2/ops_file.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/gfs2/ops_file.c b/fs/gfs2/ops_file.c index 99d726f1c7a6..48ec3d5e29eb 100644 --- a/fs/gfs2/ops_file.c +++ b/fs/gfs2/ops_file.c @@ -355,7 +355,6 @@ static int gfs2_page_mkwrite(struct vm_area_struct *vma, struct page *page) if (ret) goto out; - set_bit(GIF_SW_PAGED, &ip->i_flags); ret = gfs2_write_alloc_required(ip, pos, PAGE_CACHE_SIZE, &alloc_required); if (ret || !alloc_required) goto out_unlock; @@ -396,6 +395,8 @@ static int gfs2_page_mkwrite(struct vm_area_struct *vma, struct page *page) goto out_unlock_page; } ret = gfs2_allocate_page_backing(page); + if (!ret) + set_bit(GIF_SW_PAGED, &ip->i_flags); out_unlock_page: unlock_page(page); |