10 files changed, 71 insertions, 58 deletions

diff --git a/fs/xfs/xfs_attr.c b/fs/xfs/xfs_attr.c
index 5e5dbe62b194..557dad611de0 100644
--- a/fs/xfs/xfs_attr.c
+++ b/fs/xfs/xfs_attr.c
@@ -241,8 +241,7 @@ xfs_attr_set_int(xfs_inode_t *dp, struct xfs_name *name,
         args.firstblock = &firstblock;
         args.flist = &flist;
         args.whichfork = XFS_ATTR_FORK;
-        args.addname = 1;
-        args.oknoent = 1;
+        args.op_flags = XFS_DA_OP_ADDNAME | XFS_DA_OP_OKNOENT;
 
         /*
          * Determine space new attribute will use, and if it would be
@@ -974,7 +973,7 @@ xfs_attr_leaf_addname(xfs_da_args_t *args)
                         xfs_da_brelse(args->trans, bp);
                         return(retval);
                 }
-                args->rename = 1;                       /* an atomic rename */
+                args->op_flags |= XFS_DA_OP_RENAME;     /* an atomic rename */
                 args->blkno2 = args->blkno;             /* set 2nd entry info*/
                 args->index2 = args->index;
                 args->rmtblkno2 = args->rmtblkno;
@@ -1054,7 +1053,7 @@ xfs_attr_leaf_addname(xfs_da_args_t *args)
          * so that one disappears and one appears atomically.  Then we
          * must remove the "old" attribute/value pair.
          */
-        if (args->rename) {
+        if (args->op_flags & XFS_DA_OP_RENAME) {
                 /*
                  * In a separate transaction, set the incomplete flag on the
                  * "old" attr and clear the incomplete flag on the "new" attr.
@@ -1307,7 +1306,7 @@ restart:
         } else if (retval == EEXIST) {
                 if (args->flags & ATTR_CREATE)
                         goto out;
-                args->rename = 1;                       /* atomic rename op */
+                args->op_flags |= XFS_DA_OP_RENAME;     /* atomic rename op */
                 args->blkno2 = args->blkno;             /* set 2nd entry info*/
                 args->index2 = args->index;
                 args->rmtblkno2 = args->rmtblkno;
@@ -1425,7 +1424,7 @@ restart:
          * so that one disappears and one appears atomically.  Then we
          * must remove the "old" attribute/value pair.
          */
-        if (args->rename) {
+        if (args->op_flags & XFS_DA_OP_RENAME) {
                 /*
                  * In a separate transaction, set the incomplete flag on the
                  * "old" attr and clear the incomplete flag on the "new" attr.
diff --git a/fs/xfs/xfs_attr_leaf.c b/fs/xfs/xfs_attr_leaf.c
index a85e9caf0156..cb345e6e4850 100644
--- a/fs/xfs/xfs_attr_leaf.c
+++ b/fs/xfs/xfs_attr_leaf.c
@@ -369,9 +369,10 @@ xfs_attr_shortform_remove(xfs_da_args_t *args)
          * Fix up the start offset of the attribute fork
          */
         totsize -= size;
-        if (totsize == sizeof(xfs_attr_sf_hdr_t) && !args->addname &&
-            (mp->m_flags & XFS_MOUNT_ATTR2) && 
-            (dp->i_d.di_format != XFS_DINODE_FMT_BTREE)) {
+        if (totsize == sizeof(xfs_attr_sf_hdr_t) &&
+                                !(args->op_flags & XFS_DA_OP_ADDNAME) &&
+                                (mp->m_flags & XFS_MOUNT_ATTR2) &&
+                                (dp->i_d.di_format != XFS_DINODE_FMT_BTREE)) {
                 /*
                  * Last attribute now removed, revert to original
                  * inode format making all literal area available
@@ -389,9 +390,10 @@ xfs_attr_shortform_remove(xfs_da_args_t *args)
                 xfs_idata_realloc(dp, -size, XFS_ATTR_FORK);
                 dp->i_d.di_forkoff = xfs_attr_shortform_bytesfit(dp, totsize);
                 ASSERT(dp->i_d.di_forkoff);
-                ASSERT(totsize > sizeof(xfs_attr_sf_hdr_t) || args->addname ||
-                        !(mp->m_flags & XFS_MOUNT_ATTR2) ||
-                        dp->i_d.di_format == XFS_DINODE_FMT_BTREE);
+                ASSERT(totsize > sizeof(xfs_attr_sf_hdr_t) ||
+                                (args->op_flags & XFS_DA_OP_ADDNAME) ||
+                                !(mp->m_flags & XFS_MOUNT_ATTR2) ||
+                                dp->i_d.di_format == XFS_DINODE_FMT_BTREE);
                 dp->i_afp->if_ext_max =
                         XFS_IFORK_ASIZE(dp) / (uint)sizeof(xfs_bmbt_rec_t);
                 dp->i_df.if_ext_max =
@@ -531,7 +533,7 @@ xfs_attr_shortform_to_leaf(xfs_da_args_t *args)
         nargs.total = args->total;
         nargs.whichfork = XFS_ATTR_FORK;
         nargs.trans = args->trans;
-        nargs.oknoent = 1;
+        nargs.op_flags = XFS_DA_OP_OKNOENT;
 
         sfe = &sf->list[0];
         for (i = 0; i < sf->hdr.count; i++) {
@@ -853,7 +855,7 @@ xfs_attr_leaf_to_shortform(xfs_dabuf_t *bp, xfs_da_args_t *args, int forkoff)
         nargs.total = args->total;
         nargs.whichfork = XFS_ATTR_FORK;
         nargs.trans = args->trans;
-        nargs.oknoent = 1;
+        nargs.op_flags = XFS_DA_OP_OKNOENT;
         entry = &leaf->entries[0];
         for (i = 0; i < be16_to_cpu(leaf->hdr.count); entry++, i++) {
                 if (entry->flags & XFS_ATTR_INCOMPLETE)
@@ -1155,7 +1157,7 @@ xfs_attr_leaf_add_work(xfs_dabuf_t *bp, xfs_da_args_t *args, int mapindex)
         entry->hashval = cpu_to_be32(args->hashval);
         entry->flags = tmp ? XFS_ATTR_LOCAL : 0;
         entry->flags |= XFS_ATTR_NSP_ARGS_TO_ONDISK(args->flags);
-        if (args->rename) {
+        if (args->op_flags & XFS_DA_OP_RENAME) {
                 entry->flags |= XFS_ATTR_INCOMPLETE;
                 if ((args->blkno2 == args->blkno) &&
                     (args->index2 <= args->index)) {
diff --git a/fs/xfs/xfs_da_btree.c b/fs/xfs/xfs_da_btree.c
index ae4b18c7726b..edc0aef4e51e 100644
--- a/fs/xfs/xfs_da_btree.c
+++ b/fs/xfs/xfs_da_btree.c
@@ -1431,7 +1431,7 @@ xfs_da_path_shift(xfs_da_state_t *state, xfs_da_state_path_t *path,
         }
         if (level < 0) {
                 *result = XFS_ERROR(ENOENT);    /* we're out of our tree */
-                ASSERT(args->oknoent);
+                ASSERT(args->op_flags & XFS_DA_OP_OKNOENT);
                 return(0);
         }
 
diff --git a/fs/xfs/xfs_da_btree.h b/fs/xfs/xfs_da_btree.h
index e64c6924996f..8face64c11fb 100644
--- a/fs/xfs/xfs_da_btree.h
+++ b/fs/xfs/xfs_da_btree.h
@@ -132,14 +132,19 @@ typedef struct xfs_da_args {
         int             index2;         /* index of 2nd attr in blk */
         xfs_dablk_t     rmtblkno2;      /* remote attr value starting blkno */
         int             rmtblkcnt2;     /* remote attr value block count */
-        unsigned char   justcheck;      /* T/F: check for ok with no space */
-        unsigned char   rename;         /* T/F: this is an atomic rename op */
-        unsigned char   addname;        /* T/F: this is an add operation */
-        unsigned char   oknoent;        /* T/F: ok to return ENOENT, else die */
+        int             op_flags;       /* operation flags */
         enum xfs_dacmp  cmpresult;      /* name compare result for lookups */
 } xfs_da_args_t;
 
 /*
+ * Operation flags:
+ */
+#define XFS_DA_OP_JUSTCHECK     0x0001  /* check for ok with no space */
+#define XFS_DA_OP_RENAME        0x0002  /* this is an atomic rename op */
+#define XFS_DA_OP_ADDNAME       0x0004  /* this is an add operation */
+#define XFS_DA_OP_OKNOENT       0x0008  /* lookup/add op, ENOENT ok, else die */
+
+/*
  * Structure to describe buffer(s) for a block.
  * This is needed in the directory version 2 format case, when
  * multiple non-contiguous fsblocks might be needed to cover one
diff --git a/fs/xfs/xfs_dir2.c b/fs/xfs/xfs_dir2.c
index 675899bb7048..3387acd3e471 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);
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.
diff --git a/fs/xfs/xfs_dir2_leaf.c b/fs/xfs/xfs_dir2_leaf.c
index b52903bc0b14..2ebbed4f1b0d 100644
--- a/fs/xfs/xfs_dir2_leaf.c
+++ b/fs/xfs/xfs_dir2_leaf.c
@@ -263,20 +263,21 @@ xfs_dir2_leaf_addname(
          * If we don't have enough free bytes but we can make enough
          * by compacting out stale entries, we'll do that.
          */
-        if ((char *)bestsp - (char *)&leaf->ents[be16_to_cpu(leaf->hdr.count)] < needbytes &&
-            be16_to_cpu(leaf->hdr.stale) > 1) {
+        if ((char *)bestsp - (char *)&leaf->ents[be16_to_cpu(leaf->hdr.count)] <
+                                needbytes && be16_to_cpu(leaf->hdr.stale) > 1) {
                 compact = 1;
         }
         /*
          * Otherwise if we don't have enough free bytes we need to
          * convert to node form.
          */
-        else if ((char *)bestsp - (char *)&leaf->ents[be16_to_cpu(leaf->hdr.count)] <
-                 needbytes) {
+        else if ((char *)bestsp - (char *)&leaf->ents[be16_to_cpu(
+                                                leaf->hdr.count)] < needbytes) {
                 /*
                  * Just checking or no space reservation, give up.
                  */
-                if (args->justcheck || args->total == 0) {
+                if ((args->op_flags & XFS_DA_OP_JUSTCHECK) ||
+                                                        args->total == 0) {
                         xfs_da_brelse(tp, lbp);
                         return XFS_ERROR(ENOSPC);
                 }
@@ -301,7 +302,7 @@ xfs_dir2_leaf_addname(
          * If just checking, then it will fit unless we needed to allocate
          * a new data block.
          */
-        if (args->justcheck) {
+        if (args->op_flags & XFS_DA_OP_JUSTCHECK) {
                 xfs_da_brelse(tp, lbp);
                 return use_block == -1 ? XFS_ERROR(ENOSPC) : 0;
         }
@@ -1414,7 +1415,7 @@ xfs_dir2_leaf_lookup_int(
                         cbp = dbp;
                 }
         }
-        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, release the current
diff --git a/fs/xfs/xfs_dir2_node.c b/fs/xfs/xfs_dir2_node.c
index fedf8f976a10..c71cff85950c 100644
--- a/fs/xfs/xfs_dir2_node.c
+++ b/fs/xfs/xfs_dir2_node.c
@@ -226,7 +226,7 @@ xfs_dir2_leafn_add(
         ASSERT(index == be16_to_cpu(leaf->hdr.count) ||
                be32_to_cpu(leaf->ents[index].hashval) >= args->hashval);
 
-        if (args->justcheck)
+        if (args->op_flags & XFS_DA_OP_JUSTCHECK)
                 return 0;
 
         /*
@@ -515,7 +515,7 @@ xfs_dir2_leafn_lookup_for_addname(
         /* Didn't find any space */
         fi = -1;
 out:
-        ASSERT(args->oknoent);
+        ASSERT(args->op_flags & XFS_DA_OP_OKNOENT);
         if (curbp) {
                 /* Giving back a free block. */
                 state->extravalid = 1;
@@ -638,7 +638,8 @@ xfs_dir2_leafn_lookup_for_entry(
         /* Didn't find an exact match. */
         error = ENOENT;
         di = -1;
-        ASSERT(index == be16_to_cpu(leaf->hdr.count) || args->oknoent);
+        ASSERT(index == be16_to_cpu(leaf->hdr.count) ||
+                                        (args->op_flags & XFS_DA_OP_OKNOENT));
 out:
         if (curbp) {
                 /* Giving back a data block. */
@@ -669,7 +670,7 @@ xfs_dir2_leafn_lookup_int(
         int                     *indexp,        /* out: leaf entry index */
         xfs_da_state_t          *state)         /* state to fill in */
 {
-        if (args->addname)
+        if (args->op_flags & XFS_DA_OP_ADDNAME)
                 return xfs_dir2_leafn_lookup_for_addname(bp, args, indexp,
                                                         state);
         return xfs_dir2_leafn_lookup_for_entry(bp, args, indexp, state);
@@ -1383,7 +1384,7 @@ xfs_dir2_node_addname(
                 /*
                  * It worked, fix the hash values up the btree.
                  */
-                if (!args->justcheck)
+                if (!(args->op_flags & XFS_DA_OP_JUSTCHECK))
                         xfs_da_fixhashpath(state, &state->path);
         } else {
                 /*
@@ -1566,7 +1567,8 @@ xfs_dir2_node_addname_int(
                 /*
                  * Not allowed to allocate, return failure.
                  */
-                if (args->justcheck || args->total == 0) {
+                if ((args->op_flags & XFS_DA_OP_JUSTCHECK) ||
+                                                        args->total == 0) {
                         /*
                          * Drop the freespace buffer unless it came from our
                          * caller.
@@ -1712,7 +1714,7 @@ xfs_dir2_node_addname_int(
                 /*
                  * If just checking, we succeeded.
                  */
-                if (args->justcheck) {
+                if (args->op_flags & XFS_DA_OP_JUSTCHECK) {
                         if ((fblk == NULL || fblk->bp == NULL) && fbp != NULL)
                                 xfs_da_buf_done(fbp);
                         return 0;
diff --git a/fs/xfs/xfs_dir2_sf.c b/fs/xfs/xfs_dir2_sf.c
index dcd09cada43f..9409fd3e565f 100644
--- a/fs/xfs/xfs_dir2_sf.c
+++ b/fs/xfs/xfs_dir2_sf.c
@@ -332,7 +332,7 @@ xfs_dir2_sf_addname(
                 /*
                  * Just checking or no space reservation, it doesn't fit.
                  */
-                if (args->justcheck || args->total == 0)
+                if ((args->op_flags & XFS_DA_OP_JUSTCHECK) || args->total == 0)
                         return XFS_ERROR(ENOSPC);
                 /*
                  * Convert to block form then add the name.
@@ -345,7 +345,7 @@ xfs_dir2_sf_addname(
         /*
          * Just checking, it fits.
          */
-        if (args->justcheck)
+        if (args->op_flags & XFS_DA_OP_JUSTCHECK)
                 return 0;
         /*
          * Do it the easy way - just add it at the end.
@@ -869,7 +869,7 @@ xfs_dir2_sf_lookup(
                                 return XFS_ERROR(EEXIST);
                 }
         }
-        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 "found".
@@ -1071,7 +1071,7 @@ xfs_dir2_sf_replace(
                  * Didn't find it.
                  */
                 if (i == sfp->hdr.count) {
-                        ASSERT(args->oknoent);
+                        ASSERT(args->op_flags & XFS_DA_OP_OKNOENT);
 #if XFS_BIG_INUMS
                         if (i8elevated)
                                 xfs_dir2_sf_toino4(args);
diff --git a/fs/xfs/xfs_dir2_trace.c b/fs/xfs/xfs_dir2_trace.c
index f3fb2ffd6f5c..6cc7c0c681ac 100644
--- a/fs/xfs/xfs_dir2_trace.c
+++ b/fs/xfs/xfs_dir2_trace.c
@@ -85,7 +85,8 @@ xfs_dir2_trace_args(
                 (void *)((unsigned long)(args->inumber >> 32)),
                 (void *)((unsigned long)(args->inumber & 0xFFFFFFFF)),
                 (void *)args->dp, (void *)args->trans,
-                (void *)(unsigned long)args->justcheck, NULL, NULL);
+                (void *)(unsigned long)(args->op_flags & XFS_DA_OP_JUSTCHECK),
+                NULL, NULL);
 }
 
 void
@@ -100,7 +101,7 @@ xfs_dir2_trace_args_b(
                 (void *)((unsigned long)(args->inumber >> 32)),
                 (void *)((unsigned long)(args->inumber & 0xFFFFFFFF)),
                 (void *)args->dp, (void *)args->trans,
-                (void *)(unsigned long)args->justcheck,
+                (void *)(unsigned long)(args->op_flags & XFS_DA_OP_JUSTCHECK),
                 (void *)(bp ? bp->bps[0] : NULL), NULL);
 }
 
@@ -117,7 +118,7 @@ xfs_dir2_trace_args_bb(
                 (void *)((unsigned long)(args->inumber >> 32)),
                 (void *)((unsigned long)(args->inumber & 0xFFFFFFFF)),
                 (void *)args->dp, (void *)args->trans,
-                (void *)(unsigned long)args->justcheck,
+                (void *)(unsigned long)(args->op_flags & XFS_DA_OP_JUSTCHECK),
                 (void *)(lbp ? lbp->bps[0] : NULL),
                 (void *)(dbp ? dbp->bps[0] : NULL));
 }
@@ -157,8 +158,8 @@ xfs_dir2_trace_args_db(
                 (void *)((unsigned long)(args->inumber >> 32)),
                 (void *)((unsigned long)(args->inumber & 0xFFFFFFFF)),
                 (void *)args->dp, (void *)args->trans,
-                (void *)(unsigned long)args->justcheck, (void *)(long)db,
-                (void *)dbp);
+                (void *)(unsigned long)(args->op_flags & XFS_DA_OP_JUSTCHECK),
+                (void *)(long)db, (void *)dbp);
 }
 
 void
@@ -173,7 +174,7 @@ xfs_dir2_trace_args_i(
                 (void *)((unsigned long)(args->inumber >> 32)),
                 (void *)((unsigned long)(args->inumber & 0xFFFFFFFF)),
                 (void *)args->dp, (void *)args->trans,
-                (void *)(unsigned long)args->justcheck,
+                (void *)(unsigned long)(args->op_flags & XFS_DA_OP_JUSTCHECK),
                 (void *)((unsigned long)(i >> 32)),
                 (void *)((unsigned long)(i & 0xFFFFFFFF)));
 }
@@ -190,7 +191,8 @@ xfs_dir2_trace_args_s(
                 (void *)((unsigned long)(args->inumber >> 32)),
                 (void *)((unsigned long)(args->inumber & 0xFFFFFFFF)),
                 (void *)args->dp, (void *)args->trans,
-                (void *)(unsigned long)args->justcheck, (void *)(long)s, NULL);
+                (void *)(unsigned long)(args->op_flags & XFS_DA_OP_JUSTCHECK),
+                (void *)(long)s, NULL);
 }
 
 void
@@ -208,7 +210,7 @@ xfs_dir2_trace_args_sb(
                 (void *)((unsigned long)(args->inumber >> 32)),
                 (void *)((unsigned long)(args->inumber & 0xFFFFFFFF)),
                 (void *)args->dp, (void *)args->trans,
-                (void *)(unsigned long)args->justcheck, (void *)(long)s,
-                (void *)dbp);
+                (void *)(unsigned long)(args->op_flags & XFS_DA_OP_JUSTCHECK),
+                (void *)(long)s, (void *)dbp);
 }
 #endif  /* XFS_DIR2_TRACE */