iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'xfs-coccinelle-cleanups' into for-next

Browse Source
This commit is contained in:
Dave Chinner 2014-12-01 09:03:02 +11:00
commit c14fc01340
5 changed files with 9 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fs/xfs/libxfs/xfs_bmap.c
View File

@ -5589,12 +5589,8 @@ shift_extent:
XFS_WANT_CORRUPTED_GOTO(i == 1, out_error); XFS_WANT_CORRUPTED_GOTO(i == 1, out_error);
got.br_startoff = startoff; got.br_startoff = startoff;
error = xfs_bmbt_update(cur, got.br_startoff, got.br_startblock, return xfs_bmbt_update(cur, got.br_startoff, got.br_startblock,
got.br_blockcount, got.br_state); got.br_blockcount, got.br_state);
if (error)
return error;
return 0;
out_error: out_error:
return error; return error;

6
fs/xfs/libxfs/xfs_ialloc.c
View File

@ -1134,11 +1134,7 @@ xfs_dialloc_ag_update_inobt(
XFS_WANT_CORRUPTED_RETURN((rec.ir_free == frec->ir_free) && XFS_WANT_CORRUPTED_RETURN((rec.ir_free == frec->ir_free) &&
(rec.ir_freecount == frec->ir_freecount)); (rec.ir_freecount == frec->ir_freecount));
error = xfs_inobt_update(cur, &rec); return xfs_inobt_update(cur, &rec);
if (error)
return error;
return 0;
} }
/* /*

6
fs/xfs/xfs_file.c
View File

@ -930,7 +930,6 @@ xfs_file_readdir(
{ {
struct inode *inode = file_inode(file); struct inode *inode = file_inode(file);
xfs_inode_t *ip = XFS_I(inode); xfs_inode_t *ip = XFS_I(inode);
int error;
size_t bufsize; size_t bufsize;
/* /*
@ -947,10 +946,7 @@ xfs_file_readdir(
*/ */
bufsize = (size_t)min_t(loff_t, 32768, ip->i_d.di_size); bufsize = (size_t)min_t(loff_t, 32768, ip->i_d.di_size);
error = xfs_readdir(ip, ctx, bufsize); return xfs_readdir(ip, ctx, bufsize);
if (error)
return error;
return 0;
} }
STATIC int STATIC int

8
fs/xfs/xfs_qm.c
View File

@ -1747,22 +1747,20 @@ xfs_qm_vop_dqalloc(
xfs_iunlock(ip, lockflags); xfs_iunlock(ip, lockflags);
if (O_udqpp) if (O_udqpp)
*O_udqpp = uq; *O_udqpp = uq;
else if (uq) else
xfs_qm_dqrele(uq); xfs_qm_dqrele(uq);
if (O_gdqpp) if (O_gdqpp)
*O_gdqpp = gq; *O_gdqpp = gq;
else if (gq) else
xfs_qm_dqrele(gq); xfs_qm_dqrele(gq);
if (O_pdqpp) if (O_pdqpp)
*O_pdqpp = pq; *O_pdqpp = pq;
else if (pq) else
xfs_qm_dqrele(pq); xfs_qm_dqrele(pq);
return 0; return 0;
error_rele: error_rele:
if (gq)
xfs_qm_dqrele(gq); xfs_qm_dqrele(gq);
if (uq)
xfs_qm_dqrele(uq); xfs_qm_dqrele(uq);
return error; return error;
} }

1
fs/xfs/xfs_super.c
View File

@ -793,7 +793,6 @@ xfs_open_devices(
out_free_ddev_targ: out_free_ddev_targ:
xfs_free_buftarg(mp, mp->m_ddev_targp); xfs_free_buftarg(mp, mp->m_ddev_targp);
out_close_rtdev: out_close_rtdev:
if (rtdev)
xfs_blkdev_put(rtdev); xfs_blkdev_put(rtdev);
out_close_logdev: out_close_logdev:
if (logdev && logdev != ddev) if (logdev && logdev != ddev)