renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-20 11:13:58 +08:00
Code

gfs2: Clean up trunc_start error path

Browse Source 
Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>
Signed-off-by: Bob Peterson <rpeterso@redhat.com>
This commit is contained in:
Andreas Gruenbacher 2017-12-12 16:42:01 +01:00 committed by Bob Peterson
parent da5eb9cdda
commit 80990f404d
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
fs/gfs2/bmap.c
View File

@ -1022,7 +1022,7 @@ static int trunc_start(struct inode *inode, u64 oldsize, u64 newsize)
struct gfs2_inode *ip = GFS2_I(inode); struct gfs2_inode *ip = GFS2_I(inode);
struct gfs2_sbd *sdp = GFS2_SB(inode); struct gfs2_sbd *sdp = GFS2_SB(inode);
struct address_space *mapping = inode->i_mapping; struct address_space *mapping = inode->i_mapping;
struct buffer_head *dibh; struct buffer_head *dibh = NULL;
int journaled = gfs2_is_jdata(ip); int journaled = gfs2_is_jdata(ip);
int error; int error;
@ -1045,7 +1045,7 @@ static int trunc_start(struct inode *inode, u64 oldsize, u64 newsize)
if (newsize & (u64)(sdp->sd_sb.sb_bsize - 1)) { if (newsize & (u64)(sdp->sd_sb.sb_bsize - 1)) {
error = gfs2_block_truncate_page(mapping, newsize); error = gfs2_block_truncate_page(mapping, newsize);
if (error) if (error)
goto out_brelse; goto out;
} }
ip->i_diskflags |= GFS2_DIF_TRUNC_IN_PROG; ip->i_diskflags |= GFS2_DIF_TRUNC_IN_PROG;
} }
@ -1059,14 +1059,9 @@ static int trunc_start(struct inode *inode, u64 oldsize, u64 newsize)
else else
truncate_pagecache(inode, newsize); truncate_pagecache(inode, newsize);
if (error) {
brelse(dibh);
return error;
}
out_brelse:
brelse(dibh);
out: out:
brelse(dibh);
if (current->journal_info)
gfs2_trans_end(sdp); gfs2_trans_end(sdp);
return error; return error;
} }