[XFS] remove shouting-indirection macros from xfs_trans.h

[linux-2.6] / fs / xfs / xfs_itable.c

diff --git a/fs/xfs/xfs_itable.c b/fs/xfs/xfs_itable.c
index eb85bdedad0c7505aa90bdeb09c97403b3979631..4feda541e71410744238d349033b9a5c9179614b 100644 (file)
--- a/fs/xfs/xfs_itable.c
+++ b/fs/xfs/xfs_itable.c
@@ -71,13 +71,8 @@ xfs_bulkstat_one_iget(
 
        ASSERT(ip != NULL);
        ASSERT(ip->i_blkno != (xfs_daddr_t)0);
-       if (ip->i_d.di_mode == 0) {
-               *stat = BULKSTAT_RV_NOTHING;
-               error = XFS_ERROR(ENOENT);
-               goto out_iput;
-       }
 
-       vp = XFS_ITOV(ip);
+       vp = VFS_I(ip);
        dic = &ip->i_d;
 
        /* xfs_iget returns the following without needing
@@ -124,7 +119,6 @@ xfs_bulkstat_one_iget(
                break;
        }
 
- out_iput:
        xfs_iput(ip, XFS_ILOCK_SHARED);
        return error;
 }
@@ -263,7 +257,7 @@ xfs_bulkstat_one(
                *ubused = error;
 
  out_free:
-       kmem_free(buf, sizeof(*buf));
+       kmem_free(buf);
        return error;
 }
 
@@ -714,7 +708,7 @@ xfs_bulkstat(
        /*
         * Done, we're either out of filesystem or space to put the data.
         */
-       kmem_free(irbuf, irbsize);
+       kmem_free(irbuf);
        *ubcountp = ubelem;
        /*
         * Found some inodes, return them now and return the error next time.
@@ -920,7 +914,7 @@ xfs_inumbers(
                }
                *lastino = XFS_AGINO_TO_INO(mp, agno, agino);
        }
-       kmem_free(buffer, bcount * sizeof(*buffer));
+       kmem_free(buffer);
        if (cur)
                xfs_btree_del_cursor(cur, (error ? XFS_BTREE_ERROR :
                                           XFS_BTREE_NOERROR));