Merge branch 'xfs-coccinelle-cleanups' into xfs-misc-fixes-for-3.19-2

5 files changed, 9 insertions, 24 deletions

diff --git a/fs/xfs/libxfs/xfs_bmap.c b/fs/xfs/libxfs/xfs_bmap.c
index 79c981984dca..20d2e96aef6a 100644
--- a/fs/xfs/libxfs/xfs_bmap.c
+++ b/fs/xfs/libxfs/xfs_bmap.c
@@ -5592,12 +5592,8 @@ shift_extent:
         XFS_WANT_CORRUPTED_GOTO(i == 1, out_error);
 
         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);
-        if (error)
-                return error;
-
-        return 0;
 
 out_error:
         return error;
diff --git a/fs/xfs/libxfs/xfs_ialloc.c b/fs/xfs/libxfs/xfs_ialloc.c
index 23dcb72fc5e6..705a7530176e 100644
--- a/fs/xfs/libxfs/xfs_ialloc.c
+++ b/fs/xfs/libxfs/xfs_ialloc.c
@@ -1137,11 +1137,7 @@ xfs_dialloc_ag_update_inobt(
         XFS_WANT_CORRUPTED_RETURN((rec.ir_free == frec->ir_free) &&
                                   (rec.ir_freecount == frec->ir_freecount));
 
-        error = xfs_inobt_update(cur, &rec);
-        if (error)
-                return error;
-
-        return 0;
+        return xfs_inobt_update(cur, &rec);
 }
 
 /*
diff --git a/fs/xfs/xfs_file.c b/fs/xfs/xfs_file.c
index eb596b419942..5f467cf21c26 100644
--- a/fs/xfs/xfs_file.c
+++ b/fs/xfs/xfs_file.c
@@ -933,7 +933,6 @@ xfs_file_readdir(
 {
         struct inode    *inode = file_inode(file);
         xfs_inode_t     *ip = XFS_I(inode);
-        int             error;
         size_t          bufsize;
 
         /*
@@ -950,10 +949,7 @@ xfs_file_readdir(
          */
         bufsize = (size_t)min_t(loff_t, 32768, ip->i_d.di_size);
 
-        error = xfs_readdir(ip, ctx, bufsize);
-        if (error)
-                return error;
-        return 0;
+        return xfs_readdir(ip, ctx, bufsize);
 }
 
 STATIC int
diff --git a/fs/xfs/xfs_qm.c b/fs/xfs/xfs_qm.c
index d68f23021af3..9a4b50a411f3 100644
--- a/fs/xfs/xfs_qm.c
+++ b/fs/xfs/xfs_qm.c
@@ -1749,23 +1749,21 @@ xfs_qm_vop_dqalloc(
         xfs_iunlock(ip, lockflags);
         if (O_udqpp)
                 *O_udqpp = uq;
-        else if (uq)
+        else
                 xfs_qm_dqrele(uq);
         if (O_gdqpp)
                 *O_gdqpp = gq;
-        else if (gq)
+        else
                 xfs_qm_dqrele(gq);
         if (O_pdqpp)
                 *O_pdqpp = pq;
-        else if (pq)
+        else
                 xfs_qm_dqrele(pq);
         return 0;
 
 error_rele:
-        if (gq)
-                xfs_qm_dqrele(gq);
-        if (uq)
-                xfs_qm_dqrele(uq);
+        xfs_qm_dqrele(gq);
+        xfs_qm_dqrele(uq);
         return error;
 }
 
diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c
index 03e3cc242902..a0f58d933261 100644
--- a/fs/xfs/xfs_super.c
+++ b/fs/xfs/xfs_super.c
@@ -796,8 +796,7 @@ xfs_open_devices(
  out_free_ddev_targ:
         xfs_free_buftarg(mp, mp->m_ddev_targp);
  out_close_rtdev:
-        if (rtdev)
-                xfs_blkdev_put(rtdev);
+        xfs_blkdev_put(rtdev);
  out_close_logdev:
         if (logdev && logdev != ddev)
                 xfs_blkdev_put(logdev);