1 files changed, 48 insertions, 35 deletions

diff --git a/fs/xfs/xfs_dir2_sf.c b/fs/xfs/xfs_dir2_sf.c
index 919d275a1cef..b46af0013ec9 100644
--- a/fs/xfs/xfs_dir2_sf.c
+++ b/fs/xfs/xfs_dir2_sf.c
@@ -255,7 +255,7 @@ xfs_dir2_block_to_sf(
         xfs_dir2_sf_check(args);
 out:
         xfs_trans_log_inode(args->trans, dp, logflags);
-        kmem_free(block, mp->m_dirblksize);
+        kmem_free(block);
         return error;
 }
 
@@ -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.
@@ -512,7 +512,7 @@ xfs_dir2_sf_addname_hard(
                 sfep = xfs_dir2_sf_nextentry(sfp, sfep);
                 memcpy(sfep, oldsfep, old_isize - nbytes);
         }
-        kmem_free(buf, old_isize);
+        kmem_free(buf);
         dp->i_d.di_size = new_isize;
         xfs_dir2_sf_check(args);
 }
@@ -812,8 +812,11 @@ xfs_dir2_sf_lookup(
 {
         xfs_inode_t             *dp;            /* incore directory inode */
         int                     i;              /* entry index */
+        int                     error;
         xfs_dir2_sf_entry_t     *sfep;          /* shortform directory entry */
         xfs_dir2_sf_t           *sfp;           /* shortform structure */
+        enum xfs_dacmp          cmp;            /* comparison result */
+        xfs_dir2_sf_entry_t     *ci_sfep;       /* case-insens. entry */
 
         xfs_dir2_trace_args("sf_lookup", args);
         xfs_dir2_sf_check(args);
@@ -836,6 +839,7 @@ xfs_dir2_sf_lookup(
          */
         if (args->namelen == 1 && args->name[0] == '.') {
                 args->inumber = dp->i_ino;
+                args->cmpresult = XFS_CMP_EXACT;
                 return XFS_ERROR(EEXIST);
         }
         /*
@@ -844,28 +848,41 @@ xfs_dir2_sf_lookup(
         if (args->namelen == 2 &&
             args->name[0] == '.' && args->name[1] == '.') {
                 args->inumber = xfs_dir2_sf_get_inumber(sfp, &sfp->hdr.parent);
+                args->cmpresult = XFS_CMP_EXACT;
                 return XFS_ERROR(EEXIST);
         }
         /*
          * Loop over all the entries trying to match ours.
          */
-        for (i = 0, sfep = xfs_dir2_sf_firstentry(sfp);
-             i < sfp->hdr.count;
-             i++, sfep = xfs_dir2_sf_nextentry(sfp, sfep)) {
-                if (sfep->namelen == args->namelen &&
-                    sfep->name[0] == args->name[0] &&
-                    memcmp(args->name, sfep->name, args->namelen) == 0) {
-                        args->inumber =
-                                xfs_dir2_sf_get_inumber(sfp,
-                                        xfs_dir2_sf_inumberp(sfep));
-                        return XFS_ERROR(EEXIST);
+        ci_sfep = NULL;
+        for (i = 0, sfep = xfs_dir2_sf_firstentry(sfp); i < sfp->hdr.count;
+                                i++, sfep = xfs_dir2_sf_nextentry(sfp, sfep)) {
+                /*
+                 * Compare name and if it's an exact match, return the inode
+                 * number. If it's the first case-insensitive match, store the
+                 * inode number and continue looking for an exact match.
+                 */
+                cmp = dp->i_mount->m_dirnameops->compname(args, sfep->name,
+                                                                sfep->namelen);
+                if (cmp != XFS_CMP_DIFFERENT && cmp != args->cmpresult) {
+                        args->cmpresult = cmp;
+                        args->inumber = xfs_dir2_sf_get_inumber(sfp,
+                                                xfs_dir2_sf_inumberp(sfep));
+                        if (cmp == XFS_CMP_EXACT)
+                                return XFS_ERROR(EEXIST);
+                        ci_sfep = sfep;
                 }
         }
+        ASSERT(args->op_flags & XFS_DA_OP_OKNOENT);
         /*
-         * Didn't find it.
+         * Here, we can only be doing a lookup (not a rename or replace).
+         * If a case-insensitive match was not found, return ENOENT.
          */
-        ASSERT(args->oknoent);
-        return XFS_ERROR(ENOENT);
+        if (!ci_sfep)
+                return XFS_ERROR(ENOENT);
+        /* otherwise process the CI match as required by the caller */
+        error = xfs_dir_cilookup_result(args, ci_sfep->name, ci_sfep->namelen);
+        return XFS_ERROR(error);
 }
 
 /*
@@ -904,24 +921,21 @@ xfs_dir2_sf_removename(
          * Loop over the old directory entries.
          * Find the one we're deleting.
          */
-        for (i = 0, sfep = xfs_dir2_sf_firstentry(sfp);
-             i < sfp->hdr.count;
-             i++, sfep = xfs_dir2_sf_nextentry(sfp, sfep)) {
-                if (sfep->namelen == args->namelen &&
-                    sfep->name[0] == args->name[0] &&
-                    memcmp(sfep->name, args->name, args->namelen) == 0) {
+        for (i = 0, sfep = xfs_dir2_sf_firstentry(sfp); i < sfp->hdr.count;
+                                i++, sfep = xfs_dir2_sf_nextentry(sfp, sfep)) {
+                if (xfs_da_compname(args, sfep->name, sfep->namelen) ==
+                                                                XFS_CMP_EXACT) {
                         ASSERT(xfs_dir2_sf_get_inumber(sfp,
-                                        xfs_dir2_sf_inumberp(sfep)) ==
-                                args->inumber);
+                                                xfs_dir2_sf_inumberp(sfep)) ==
+                                                                args->inumber);
                         break;
                 }
         }
         /*
          * Didn't find it.
          */
-        if (i == sfp->hdr.count) {
+        if (i == sfp->hdr.count)
                 return XFS_ERROR(ENOENT);
-        }
         /*
          * Calculate sizes.
          */
@@ -1042,11 +1056,10 @@ xfs_dir2_sf_replace(
          */
         else {
                 for (i = 0, sfep = xfs_dir2_sf_firstentry(sfp);
-                     i < sfp->hdr.count;
-                     i++, sfep = xfs_dir2_sf_nextentry(sfp, sfep)) {
-                        if (sfep->namelen == args->namelen &&
-                            sfep->name[0] == args->name[0] &&
-                            memcmp(args->name, sfep->name, args->namelen) == 0) {
+                                i < sfp->hdr.count;
+                                i++, sfep = xfs_dir2_sf_nextentry(sfp, sfep)) {
+                        if (xfs_da_compname(args, sfep->name, sfep->namelen) ==
+                                                                XFS_CMP_EXACT) {
 #if XFS_BIG_INUMS || defined(DEBUG)
                                 ino = xfs_dir2_sf_get_inumber(sfp,
                                         xfs_dir2_sf_inumberp(sfep));
@@ -1061,7 +1074,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);
@@ -1174,7 +1187,7 @@ xfs_dir2_sf_toino4(
         /*
          * Clean up the inode.
          */
-        kmem_free(buf, oldsize);
+        kmem_free(buf);
         dp->i_d.di_size = newsize;
         xfs_trans_log_inode(args->trans, dp, XFS_ILOG_CORE | XFS_ILOG_DDATA);
 }
@@ -1251,7 +1264,7 @@ xfs_dir2_sf_toino8(
         /*
          * Clean up the inode.
          */
-        kmem_free(buf, oldsize);
+        kmem_free(buf);
         dp->i_d.di_size = newsize;
         xfs_trans_log_inode(args->trans, dp, XFS_ILOG_CORE | XFS_ILOG_DDATA);
 }