[XFS] Add op_flags field and helpers to xfs_da_args

The end of the xfs_da_args structure has 4 unsigned char fields for
true/false information on directory and attr operations using the
xfs_da_args structure.

The following converts these 4 into a op_flags field that uses the first 4
bits for these fields and allows expansion for future operation
information (eg. case-insensitive lookup request).

SGI-PV: 981520
SGI-Modid: xfs-linux-melb:xfs-kern:31206a

Signed-off-by: Barry Naujok <bnaujok@sgi.com>
Signed-off-by: Christoph Hellwig <hch@infradead.org>

1 files changed, 5 insertions, 5 deletions

diff --git a/fs/xfs/xfs_dir2_block.c b/fs/xfs/xfs_dir2_block.c
index 98588491cb0e..dee225918db2 100644
--- a/fs/xfs/xfs_dir2_block.c
+++ b/fs/xfs/xfs_dir2_block.c
@@ -215,7 +215,7 @@ xfs_dir2_block_addname(
         /*
          * If this isn't a real add, we're done with the buffer.
          */
-        if (args->justcheck)
+        if (args->op_flags & XFS_DA_OP_JUSTCHECK)
                 xfs_da_brelse(tp, bp);
         /*
          * If we don't have space for the new entry & leaf ...
@@ -225,7 +225,7 @@ xfs_dir2_block_addname(
                  * Not trying to actually do anything, or don't have
                  * a space reservation: return no-space.
                  */
-                if (args->justcheck || args->total == 0)
+                if ((args->op_flags & XFS_DA_OP_JUSTCHECK) || args->total == 0)
                         return XFS_ERROR(ENOSPC);
                 /*
                  * Convert to the next larger format.
@@ -240,7 +240,7 @@ xfs_dir2_block_addname(
         /*
          * Just checking, and it would work, so say so.
          */
-        if (args->justcheck)
+        if (args->op_flags & XFS_DA_OP_JUSTCHECK)
                 return 0;
         needlog = needscan = 0;
         /*
@@ -674,7 +674,7 @@ xfs_dir2_block_lookup_int(
                 else
                         high = mid - 1;
                 if (low > high) {
-                        ASSERT(args->oknoent);
+                        ASSERT(args->op_flags & XFS_DA_OP_OKNOENT);
                         xfs_da_brelse(tp, bp);
                         return XFS_ERROR(ENOENT);
                 }
@@ -713,7 +713,7 @@ xfs_dir2_block_lookup_int(
         } while (++mid < be32_to_cpu(btp->count) &&
                         be32_to_cpu(blp[mid].hashval) == hash);
 
-        ASSERT(args->oknoent);
+        ASSERT(args->op_flags & XFS_DA_OP_OKNOENT);
         /*
          * Here, we can only be doing a lookup (not a rename or replace).
          * If a case-insensitive match was found earlier, return success.