xfs: cleanup duplicate initializations
authorDavid Sterba <dsterba@suse.cz>
Wed, 13 Apr 2011 22:03:28 +0000 (22:03 +0000)
committerAlex Elder <aelder@sgi.com>
Thu, 28 Apr 2011 18:25:29 +0000 (13:25 -0500)
follow these guidelines:
- leave initialization in the declaration block if it fits the line
- move to the code where it's more suitable ('for' init block)

The last chunk was modified from David's original to be a correct
fix for what appeared to be a duplicate initialization.

Signed-off-by: David Sterba <dsterba@suse.cz>
Signed-off-by: Alex Elder <aelder@sgi.com>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
fs/xfs/xfs_dfrag.c
fs/xfs/xfs_inode_item.c
fs/xfs/xfs_mount.c

index be628677c2884723c58cce77f6f98af4ff3d1926..9a84a85c03b1d8df913ec98732cb61c64c840e9f 100644 (file)
@@ -202,7 +202,7 @@ xfs_swap_extents(
        xfs_inode_t     *tip,   /* tmp inode */
        xfs_swapext_t   *sxp)
 {
-       xfs_mount_t     *mp;
+       xfs_mount_t     *mp = ip->i_mount;
        xfs_trans_t     *tp;
        xfs_bstat_t     *sbp = &sxp->sx_stat;
        xfs_ifork_t     *tempifp, *ifp, *tifp;
@@ -212,16 +212,12 @@ xfs_swap_extents(
        int             taforkblks = 0;
        __uint64_t      tmp;
 
-       mp = ip->i_mount;
-
        tempifp = kmem_alloc(sizeof(xfs_ifork_t), KM_MAYFAIL);
        if (!tempifp) {
                error = XFS_ERROR(ENOMEM);
                goto out;
        }
 
-       sbp = &sxp->sx_stat;
-
        /*
         * we have to do two separate lock calls here to keep lockdep
         * happy. If we try to get all the locks in one call, lock will
index 576fdfe81d603176abb31cf35c1b90901ca1ca5c..09983a3344a569094a1799dfa32990214cdb38b9 100644 (file)
@@ -970,7 +970,6 @@ xfs_iflush_abort(
 {
        xfs_inode_log_item_t    *iip = ip->i_itemp;
 
-       iip = ip->i_itemp;
        if (iip) {
                struct xfs_ail  *ailp = iip->ili_item.li_ailp;
                if (iip->ili_item.li_flags & XFS_LI_IN_AIL) {
index bb3f9a7b24ed7b6d36ef5536ea9d0b4020d9725e..b49b82363d203dfa8d2c19abe9e08993b34c27e9 100644 (file)
@@ -1900,7 +1900,7 @@ xfs_mod_incore_sb_batch(
        uint                    nmsb,
        int                     rsvd)
 {
-       xfs_mod_sb_t            *msbp = &msb[0];
+       xfs_mod_sb_t            *msbp;
        int                     error = 0;
 
        /*
@@ -1910,7 +1910,7 @@ xfs_mod_incore_sb_batch(
         * changes will be atomic.
         */
        spin_lock(&mp->m_sb_lock);
-       for (msbp = &msbp[0]; msbp < (msb + nmsb); msbp++) {
+       for (msbp = msb; msbp < (msb + nmsb); msbp++) {
                ASSERT(msbp->msb_field < XFS_SBS_ICOUNT ||
                       msbp->msb_field > XFS_SBS_FDBLOCKS);