xfs
[Top] [All Lists]

[PATCH] xfs: cleanup duplicate initializations

To: xfs@xxxxxxxxxxx
Subject: [PATCH] xfs: cleanup duplicate initializations
From: David Sterba <dsterba@xxxxxxx>
Date: Mon, 28 Mar 2011 19:12:53 +0200
Cc: aelder@xxxxxxx, David Sterba <dsterba@xxxxxxx>
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)

Signed-off-by: David Sterba <dsterba@xxxxxxx>
---
 fs/xfs/xfs_dfrag.c      |    6 +-----
 fs/xfs/xfs_inode_item.c |    1 -
 fs/xfs/xfs_mount.c      |    2 +-
 3 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/fs/xfs/xfs_dfrag.c b/fs/xfs/xfs_dfrag.c
index be62867..9a84a85 100644
--- a/fs/xfs/xfs_dfrag.c
+++ b/fs/xfs/xfs_dfrag.c
@@ -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
diff --git a/fs/xfs/xfs_inode_item.c b/fs/xfs/xfs_inode_item.c
index 46cc401..c64458b 100644
--- a/fs/xfs/xfs_inode_item.c
+++ b/fs/xfs/xfs_inode_item.c
@@ -957,7 +957,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) {
diff --git a/fs/xfs/xfs_mount.c b/fs/xfs/xfs_mount.c
index bb3f9a7..08de13d 100644
--- a/fs/xfs/xfs_mount.c
+++ b/fs/xfs/xfs_mount.c
@@ -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;
 
        /*
-- 
1.7.4.1.176.g501cc

<Prev in Thread] Current Thread [Next in Thread>