xfs
[Top] [All Lists]

[PATCH 08/16] xfs: change interface of xfs_nameops.hashname

To: linux-fsdevel@xxxxxxxxxxxxxxx
Subject: [PATCH 08/16] xfs: change interface of xfs_nameops.hashname
From: Ben Myers <bpm@xxxxxxx>
Date: Fri, 3 Oct 2014 16:58:44 -0500
Cc: xfs@xxxxxxxxxxx, olaf@xxxxxxx
Delivered-to: xfs@xxxxxxxxxxx
In-reply-to: <20141003214758.GY1865@xxxxxxx>
References: <20141003214758.GY1865@xxxxxxx>
User-agent: Mutt/1.5.20 (2009-06-14)
From: Olaf Weber <olaf@xxxxxxx>

With the introduction of the xfs_nameops.normhash callout, all uses of the
hashname callout now occur in places where an xfs_name structure must be
explicitly created just to match the parameter passing convention of this
callout. Change the arguments to a const unsigned char * and int instead.

Signed-off-by: Olaf Weber <olaf@xxxxxxx>

[v2: pass a 3rd argument for sb_utf8version to hashname.  --bpm]
---
 fs/xfs/libxfs/xfs_da_btree.c   | 18 ++++++++++--------
 fs/xfs/libxfs/xfs_da_btree.h   |  3 ++-
 fs/xfs/libxfs/xfs_dir2.c       |  8 +++++---
 fs/xfs/libxfs/xfs_dir2_block.c |  4 +++-
 fs/xfs/libxfs/xfs_dir2_data.c  |  4 +++-
 5 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/fs/xfs/libxfs/xfs_da_btree.c b/fs/xfs/libxfs/xfs_da_btree.c
index 07a3acf..ec6cc98 100644
--- a/fs/xfs/libxfs/xfs_da_btree.c
+++ b/fs/xfs/libxfs/xfs_da_btree.c
@@ -1973,6 +1973,15 @@ xfs_da_hashname(const __uint8_t *name, int namelen)
        }
 }
 
+xfs_dahash_t
+xfs_da_hashname_op(
+       const __uint8_t         *name,
+       int                     namelen,
+       unsigned int            unused)
+{
+       return xfs_da_hashname(name, namelen);
+}
+
 enum xfs_dacmp
 xfs_da_compname(
        struct xfs_da_args *args,
@@ -1983,13 +1992,6 @@ xfs_da_compname(
                                        XFS_CMP_EXACT : XFS_CMP_DIFFERENT;
 }
 
-static xfs_dahash_t
-xfs_default_hashname(
-       struct xfs_name *name)
-{
-       return xfs_da_hashname(name->name, name->len);
-}
-
 STATIC int
 xfs_da_normhash(
        struct xfs_da_args *args)
@@ -1999,7 +2001,7 @@ xfs_da_normhash(
 }
 
 const struct xfs_nameops xfs_default_nameops = {
-       .hashname       = xfs_default_hashname,
+       .hashname       = xfs_da_hashname_op,
        .normhash       = xfs_da_normhash,
        .compname       = xfs_da_compname
 };
diff --git a/fs/xfs/libxfs/xfs_da_btree.h b/fs/xfs/libxfs/xfs_da_btree.h
index 6cdafee..ce6888a 100644
--- a/fs/xfs/libxfs/xfs_da_btree.h
+++ b/fs/xfs/libxfs/xfs_da_btree.h
@@ -151,7 +151,8 @@ typedef struct xfs_da_state {
  * Name ops for directory and/or attr name operations
  */
 struct xfs_nameops {
-       xfs_dahash_t    (*hashname)(struct xfs_name *);
+       xfs_dahash_t    (*hashname)(const unsigned char *, int,
+                                       unsigned int);
        int             (*normhash)(struct xfs_da_args *);
        enum xfs_dacmp  (*compname)(struct xfs_da_args *,
                                        const unsigned char *, int);
diff --git a/fs/xfs/libxfs/xfs_dir2.c b/fs/xfs/libxfs/xfs_dir2.c
index 55733a6..4eb0973 100644
--- a/fs/xfs/libxfs/xfs_dir2.c
+++ b/fs/xfs/libxfs/xfs_dir2.c
@@ -45,13 +45,15 @@ struct xfs_name xfs_name_dotdot = { (unsigned char *)"..", 
2, XFS_DIR3_FT_DIR };
  */
 STATIC xfs_dahash_t
 xfs_ascii_ci_hashname(
-       struct xfs_name *name)
+       const unsigned char *name,
+       int len,
+       unsigned int unused)
 {
        xfs_dahash_t    hash;
        int             i;
 
-       for (i = 0, hash = 0; i < name->len; i++)
-               hash = tolower(name->name[i]) ^ rol32(hash, 7);
+       for (i = 0, hash = 0; i < len; i++)
+               hash = tolower(name[i]) ^ rol32(hash, 7);
 
        return hash;
 }
diff --git a/fs/xfs/libxfs/xfs_dir2_block.c b/fs/xfs/libxfs/xfs_dir2_block.c
index 990bf0c..12ebdd8 100644
--- a/fs/xfs/libxfs/xfs_dir2_block.c
+++ b/fs/xfs/libxfs/xfs_dir2_block.c
@@ -1231,7 +1231,9 @@ xfs_dir2_sf_to_block(
                name.name = sfep->name;
                name.len = sfep->namelen;
                blp[2 + i].hashval = cpu_to_be32(mp->m_dirnameops->
-                                                       hashname(&name));
+                                       hashname(sfep->name,
+                                                sfep->namelen,
+                                                0 /* version for later */));
                blp[2 + i].address = cpu_to_be32(xfs_dir2_byte_to_dataptr(
                                                 (char *)dep - (char *)hdr));
                offset = (int)((char *)(tagp + 1) - (char *)hdr);
diff --git a/fs/xfs/libxfs/xfs_dir2_data.c b/fs/xfs/libxfs/xfs_dir2_data.c
index fdd803f..25b0f7b 100644
--- a/fs/xfs/libxfs/xfs_dir2_data.c
+++ b/fs/xfs/libxfs/xfs_dir2_data.c
@@ -179,7 +179,9 @@ __xfs_dir3_data_check(
                                                ((char *)dep - (char *)hdr));
                        name.name = dep->name;
                        name.len = dep->namelen;
-                       hash = mp->m_dirnameops->hashname(&name);
+                       hash = mp->m_dirnameops->hashname(dep->name,
+                                       dep->namelen,
+                                       0 /* version for later */);
                        for (i = 0; i < be32_to_cpu(btp->count); i++) {
                                if (be32_to_cpu(lep[i].address) == addr &&
                                    be32_to_cpu(lep[i].hashval) == hash)
-- 
1.7.12.4

<Prev in Thread] Current Thread [Next in Thread>