diff --git a/[refs] b/[refs] index 69ffefe9d054..be4f4b264aff 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a2d7d021d78dbc00d24d9c809c64a7f3e61fa773 +refs/heads/master: abbdbd2065e74411dc2c401501c2c85a82f60e06 diff --git a/trunk/fs/gfs2/dir.c b/trunk/fs/gfs2/dir.c index d43caf04bb68..ce52bd954df6 100644 --- a/trunk/fs/gfs2/dir.c +++ b/trunk/fs/gfs2/dir.c @@ -212,8 +212,6 @@ static int gfs2_dir_write_data(struct gfs2_inode *ip, const char *buf, gfs2_trans_add_bh(ip->i_gl, bh, 1); memcpy(bh->b_data + o, buf, amount); brelse(bh); - if (error) - goto fail; buf += amount; copied += amount;