[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, 8 insertions, 6 deletions

diff --git a/fs/xfs/xfs_dir2.c b/fs/xfs/xfs_dir2.c
index 675899bb704..3387acd3e47 100644
--- a/fs/xfs/xfs_dir2.c
+++ b/fs/xfs/xfs_dir2.c
@@ -46,6 +46,8 @@
 
 struct xfs_name xfs_name_dotdot = {"..", 2};
 
+extern const struct xfs_nameops xfs_default_nameops;
+
 void
 xfs_dir_mount(
         xfs_mount_t     *mp)
@@ -173,8 +175,7 @@ xfs_dir_createname(
         args.total = total;
         args.whichfork = XFS_DATA_FORK;
         args.trans = tp;
-        args.justcheck = 0;
-        args.addname = args.oknoent = 1;
+        args.op_flags = XFS_DA_OP_ADDNAME | XFS_DA_OP_OKNOENT;
 
         if (dp->i_d.di_format == XFS_DINODE_FMT_LOCAL)
                 rval = xfs_dir2_sf_addname(&args);
@@ -215,7 +216,7 @@ xfs_dir_lookup(
         args.dp = dp;
         args.whichfork = XFS_DATA_FORK;
         args.trans = tp;
-        args.oknoent = 1;
+        args.op_flags = XFS_DA_OP_OKNOENT;
         args.cmpresult = XFS_CMP_DIFFERENT;
 
         if (dp->i_d.di_format == XFS_DINODE_FMT_LOCAL)
@@ -267,7 +268,7 @@ xfs_dir_removename(
         args.total = total;
         args.whichfork = XFS_DATA_FORK;
         args.trans = tp;
-        args.justcheck = args.addname = args.oknoent = 0;
+        args.op_flags = 0;
 
         if (dp->i_d.di_format == XFS_DINODE_FMT_LOCAL)
                 rval = xfs_dir2_sf_removename(&args);
@@ -350,7 +351,7 @@ xfs_dir_replace(
         args.total = total;
         args.whichfork = XFS_DATA_FORK;
         args.trans = tp;
-        args.justcheck = args.addname = args.oknoent = 0;
+        args.op_flags = 0;
 
         if (dp->i_d.di_format == XFS_DINODE_FMT_LOCAL)
                 rval = xfs_dir2_sf_replace(&args);
@@ -394,7 +395,8 @@ xfs_dir_canenter(
         args.dp = dp;
         args.whichfork = XFS_DATA_FORK;
         args.trans = tp;
-        args.justcheck = args.addname = args.oknoent = 1;
+        args.op_flags = XFS_DA_OP_JUSTCHECK | XFS_DA_OP_ADDNAME |
+                                                        XFS_DA_OP_OKNOENT;
 
         if (dp->i_d.di_format == XFS_DINODE_FMT_LOCAL)
                 rval = xfs_dir2_sf_addname(&args);