diff options
Diffstat (limited to 'fs/gfs2/page.c')
-rw-r--r-- | fs/gfs2/page.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/fs/gfs2/page.c b/fs/gfs2/page.c index ea31bceac4f2..3542aa6b01c4 100644 --- a/fs/gfs2/page.c +++ b/fs/gfs2/page.c | |||
@@ -172,8 +172,8 @@ int gfs2_unstuffer_page(struct gfs2_inode *ip, struct buffer_head *dibh, | |||
172 | map_bh(bh, inode->i_sb, block); | 172 | map_bh(bh, inode->i_sb, block); |
173 | 173 | ||
174 | set_buffer_uptodate(bh); | 174 | set_buffer_uptodate(bh); |
175 | if (sdp->sd_args.ar_data == GFS2_DATA_ORDERED) | 175 | if ((sdp->sd_args.ar_data == GFS2_DATA_ORDERED) || gfs2_is_jdata(ip)) |
176 | gfs2_trans_add_databuf(sdp, bh); | 176 | gfs2_trans_add_bh(ip->i_gl, bh, 0); |
177 | mark_buffer_dirty(bh); | 177 | mark_buffer_dirty(bh); |
178 | 178 | ||
179 | if (release) { | 179 | if (release) { |
@@ -245,8 +245,8 @@ int gfs2_block_truncate_page(struct address_space *mapping) | |||
245 | goto unlock; | 245 | goto unlock; |
246 | } | 246 | } |
247 | 247 | ||
248 | if (sdp->sd_args.ar_data == GFS2_DATA_ORDERED/* || gfs2_is_jdata(ip)*/) | 248 | if (sdp->sd_args.ar_data == GFS2_DATA_ORDERED || gfs2_is_jdata(ip)) |
249 | gfs2_trans_add_databuf(sdp, bh); | 249 | gfs2_trans_add_bh(ip->i_gl, bh, 0); |
250 | 250 | ||
251 | kaddr = kmap_atomic(page, KM_USER0); | 251 | kaddr = kmap_atomic(page, KM_USER0); |
252 | memset(kaddr + offset, 0, length); | 252 | memset(kaddr + offset, 0, length); |
@@ -273,7 +273,7 @@ void gfs2_page_add_databufs(struct gfs2_inode *ip, struct page *page, | |||
273 | end = start + bsize; | 273 | end = start + bsize; |
274 | if (end <= from || start >= to) | 274 | if (end <= from || start >= to) |
275 | continue; | 275 | continue; |
276 | gfs2_trans_add_databuf(ip->i_sbd, bh); | 276 | gfs2_trans_add_bh(ip->i_gl, bh, 0); |
277 | } | 277 | } |
278 | } | 278 | } |
279 | 279 | ||