summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBob Peterson <rpeterso@redhat.com>2007-09-02 10:55:29 +0100
committerSteven Whitehouse <swhiteho@redhat.com>2007-10-10 08:56:05 +0100
commit8475487befb29eeb038fef374a7433d276336a25 (patch)
tree1fb635fc8880475ab2042f4030b2643b31a63654
parentd7b616e252b125f12b007c392f7644053bb6f140 (diff)
downloadlinux-3.10-8475487befb29eeb038fef374a7433d276336a25.tar.gz
linux-3.10-8475487befb29eeb038fef374a7433d276336a25.tar.bz2
linux-3.10-8475487befb29eeb038fef374a7433d276336a25.zip
[GFS2] Fix ordering of dirty/journal for ordered buffer unstuffing
Signed-off-by: Bob Peterson <rpeterso@redhat.com> Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
-rw-r--r--fs/gfs2/bmap.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/gfs2/bmap.c b/fs/gfs2/bmap.c
index 1e56f4de735..93fa427bb5f 100644
--- a/fs/gfs2/bmap.c
+++ b/fs/gfs2/bmap.c
@@ -93,10 +93,10 @@ static int gfs2_unstuffer_page(struct gfs2_inode *ip, struct buffer_head *dibh,
map_bh(bh, inode->i_sb, block);
set_buffer_uptodate(bh);
- if (sdp->sd_args.ar_data == GFS2_DATA_ORDERED || gfs2_is_jdata(ip))
- gfs2_trans_add_bh(ip->i_gl, bh, 0);
if (!gfs2_is_jdata(ip))
mark_buffer_dirty(bh);
+ if (sdp->sd_args.ar_data == GFS2_DATA_ORDERED || gfs2_is_jdata(ip))
+ gfs2_trans_add_bh(ip->i_gl, bh, 0);
if (release) {
unlock_page(page);