diff options
Diffstat (limited to 'fs/gfs2/ops_address.c')
-rw-r--r-- | fs/gfs2/ops_address.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/fs/gfs2/ops_address.c b/fs/gfs2/ops_address.c index 8f839120a473..89a8b8fad2e7 100644 --- a/fs/gfs2/ops_address.c +++ b/fs/gfs2/ops_address.c | |||
@@ -357,7 +357,8 @@ static int gfs2_prepare_write(struct file *file, struct page *page, | |||
357 | 357 | ||
358 | if (gfs2_is_stuffed(ip)) { | 358 | if (gfs2_is_stuffed(ip)) { |
359 | if (end > sdp->sd_sb.sb_bsize - sizeof(struct gfs2_dinode)) { | 359 | if (end > sdp->sd_sb.sb_bsize - sizeof(struct gfs2_dinode)) { |
360 | error = gfs2_unstuff_dinode(ip, gfs2_unstuffer_page, page); | 360 | error = gfs2_unstuff_dinode(ip, gfs2_unstuffer_page, |
361 | page); | ||
361 | if (error == 0) | 362 | if (error == 0) |
362 | goto prepare_write; | 363 | goto prepare_write; |
363 | } else if (!PageUptodate(page)) | 364 | } else if (!PageUptodate(page)) |
@@ -432,7 +433,8 @@ static int gfs2_commit_write(struct file *file, struct page *page, | |||
432 | if (inode->i_size < file_size) | 433 | if (inode->i_size < file_size) |
433 | i_size_write(inode, file_size); | 434 | i_size_write(inode, file_size); |
434 | } else { | 435 | } else { |
435 | if (sdp->sd_args.ar_data == GFS2_DATA_ORDERED || gfs2_is_jdata(ip)) | 436 | if (sdp->sd_args.ar_data == GFS2_DATA_ORDERED || |
437 | gfs2_is_jdata(ip)) | ||
436 | gfs2_page_add_databufs(ip, page, from, to); | 438 | gfs2_page_add_databufs(ip, page, from, to); |
437 | error = generic_commit_write(file, page, from, to); | 439 | error = generic_commit_write(file, page, from, to); |
438 | if (error) | 440 | if (error) |