[XFS] kill the XFS_IMAP_BULKSTAT flag

Just pass down the XFS_IGET_* flags all the way down to xfs_imap instead
of translating them mid-way.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Dave Chinner <david@fromorbit.com>
Signed-off-by: Niv Sardi <xaiki@sgi.com>

diff --git a/fs/xfs/xfs_ialloc.c b/fs/xfs/xfs_ialloc.c
index 4f4557262d9fcc1b87c30aa8e1c3e7f6326d5dbc..e6ebbaeb4dc6ac6e62460e8f04bae3a29b3d7adf 100644 (file)
--- a/fs/xfs/xfs_ialloc.c
+++ b/fs/xfs/xfs_ialloc.c
@@ -1228,7 +1228,7 @@ xfs_imap(
            ino != XFS_AGINO_TO_INO(mp, agno, agino)) {
 #ifdef DEBUG
                /* no diagnostics for bulkstat, ino comes from userspace */
-               if (flags & XFS_IMAP_BULKSTAT)
+               if (flags & XFS_IGET_BULKSTAT)
                        return XFS_ERROR(EINVAL);
                if (agno >= mp->m_sb.sb_agcount) {
                        xfs_fs_cmn_err(CE_ALERT, mp,

diff --git a/fs/xfs/xfs_iget.c b/fs/xfs/xfs_iget.c
index bf4dc5eb4cfc77c673c6843ec1ad1c12fb808182..d60522a73a171f73565aedb57ded4755c0ef3e0d 100644 (file)
--- a/fs/xfs/xfs_iget.c
+++ b/fs/xfs/xfs_iget.c
@@ -159,8 +159,7 @@ xfs_iget_cache_miss(
         * Read the disk inode attributes into a new inode structure and get
         * a new vnode for it. This should also initialize i_ino and i_mount.
         */
-       error = xfs_iread(mp, tp, ino, &ip, bno,
-                         (flags & XFS_IGET_BULKSTAT) ? XFS_IMAP_BULKSTAT : 0);
+       error = xfs_iread(mp, tp, ino, &ip, bno, flags);
        if (error)
                return error;
 

diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c
index 72dc7a87a14b1d4a2de290ebb666c000fcefe964..4290760473fff51b847c8540da203a1498349c28 100644 (file)
--- a/fs/xfs/xfs_inode.c
+++ b/fs/xfs/xfs_inode.c
@@ -136,7 +136,7 @@ xfs_imap_to_bp(
        struct xfs_imap *imap,
        xfs_buf_t       **bpp,
        uint            buf_flags,
-       uint            imap_flags)
+       uint            iget_flags)
 {
        int             error;
        int             i;
@@ -178,7 +178,7 @@ xfs_imap_to_bp(
                if (unlikely(XFS_TEST_ERROR(!di_ok, mp,
                                                XFS_ERRTAG_ITOBP_INOTOBP,
                                                XFS_RANDOM_ITOBP_INOTOBP))) {
-                       if (imap_flags & XFS_IMAP_BULKSTAT) {
+                       if (iget_flags & XFS_IGET_BULKSTAT) {
                                xfs_trans_brelse(tp, bp);
                                return XFS_ERROR(EINVAL);
                        }

diff --git a/fs/xfs/xfs_inode.h b/fs/xfs/xfs_inode.h
index d5c3aa1b18ef0a791794a62de4f607cd8800132f..49e609c39d7e7f25aa57284b8ddc694013ab1971 100644 (file)
--- a/fs/xfs/xfs_inode.h
+++ b/fs/xfs/xfs_inode.h
@@ -166,11 +166,6 @@ typedef struct xfs_icdinode {
 #define        XFS_IFBROOT     0x04    /* i_broot points to the bmap b-tree root */
 #define        XFS_IFEXTIREC   0x08    /* Indirection array of extent blocks */
 
-/*
- * Flags for xfs_inotobp and xfs_imap().
- */
-#define XFS_IMAP_BULKSTAT      0x1
-
 /*
  * Fork handling.
  */

diff --git a/fs/xfs/xfs_itable.c b/fs/xfs/xfs_itable.c
index 4315ce642b4e657a5e0227cbb2b636063b079459..d4c0de86012490783176f4e7ecff7424c435faac 100644 (file)
--- a/fs/xfs/xfs_itable.c
+++ b/fs/xfs/xfs_itable.c
@@ -595,7 +595,7 @@ xfs_bulkstat(
 
                                                error = xfs_inotobp(mp, NULL, ino, &dip,
                                                                    &bp, &offset,
-                                                                   XFS_IMAP_BULKSTAT);
+                                                                   XFS_IGET_BULKSTAT);
 
                                                if (!error)
                                                        clustidx = offset / mp->m_sb.sb_inodesize;