xfs: fix set-but-unused warnings

The kernel compile doesn't turn on these checks by default, so it's
only when I do a kernel-user sync that I find that there are lots of
compiler warnings waiting to be fixed. Fix up these set-but-unused
warnings.

Signed-off-by: Dave Chinner <dchinner@redhat.com>
Reviewed-by: Eric Sandeen <sandeen@redhat.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Dave Chinner <david@fromorbit.com>

1 files changed, 2 insertions, 10 deletions

diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c
index 2ffb80267e37..c0b17ec70c99 100644
--- a/fs/xfs/xfs_inode.c
+++ b/fs/xfs/xfs_inode.c
@@ -2485,9 +2485,7 @@ xfs_remove(
         xfs_fsblock_t           first_block;
         int                     cancel_flags;
         int                     committed;
-        int                     link_zero;
         uint                    resblks;
-        uint                    log_count;
 
         trace_xfs_remove(dp, name);
 
@@ -2502,13 +2500,10 @@ xfs_remove(
         if (error)
                 goto std_return;
 
-        if (is_dir) {
+        if (is_dir)
                 tp = xfs_trans_alloc(mp, XFS_TRANS_RMDIR);
-                log_count = XFS_DEFAULT_LOG_COUNT;
-        } else {
+        else
                 tp = xfs_trans_alloc(mp, XFS_TRANS_REMOVE);
-                log_count = XFS_REMOVE_LOG_COUNT;
-        }
         cancel_flags = XFS_TRANS_RELEASE_LOG_RES;
 
         /*
@@ -2576,9 +2571,6 @@ xfs_remove(
         if (error)
                 goto out_trans_cancel;
 
-        /* Determine if this is the last link while the inode is locked */
-        link_zero = (ip->i_d.di_nlink == 0);
-
         xfs_bmap_init(&free_list, &first_block);
         error = xfs_dir_removename(tp, dp, name, ip->i_ino,
                                         &first_block, &free_list, resblks);