diff options
author | Bob Peterson <rpeterso@redhat.com> | 2007-09-02 05:55:29 -0400 |
---|---|---|
committer | Steven Whitehouse <swhiteho@redhat.com> | 2007-10-10 03:56:05 -0400 |
commit | 8475487befb29eeb038fef374a7433d276336a25 (patch) | |
tree | 1fb635fc8880475ab2042f4030b2643b31a63654 /fs | |
parent | d7b616e252b125f12b007c392f7644053bb6f140 (diff) |
[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>
Diffstat (limited to 'fs')
-rw-r--r-- | fs/gfs2/bmap.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/gfs2/bmap.c b/fs/gfs2/bmap.c index 1e56f4de7358..93fa427bb5f5 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, | |||
93 | map_bh(bh, inode->i_sb, block); | 93 | map_bh(bh, inode->i_sb, block); |
94 | 94 | ||
95 | set_buffer_uptodate(bh); | 95 | set_buffer_uptodate(bh); |
96 | if (sdp->sd_args.ar_data == GFS2_DATA_ORDERED || gfs2_is_jdata(ip)) | ||
97 | gfs2_trans_add_bh(ip->i_gl, bh, 0); | ||
98 | if (!gfs2_is_jdata(ip)) | 96 | if (!gfs2_is_jdata(ip)) |
99 | mark_buffer_dirty(bh); | 97 | mark_buffer_dirty(bh); |
98 | if (sdp->sd_args.ar_data == GFS2_DATA_ORDERED || gfs2_is_jdata(ip)) | ||
99 | gfs2_trans_add_bh(ip->i_gl, bh, 0); | ||
100 | 100 | ||
101 | if (release) { | 101 | if (release) { |
102 | unlock_page(page); | 102 | unlock_page(page); |