diff options
author | Barry Naujok <bnaujok@sgi.com> | 2008-05-21 02:41:01 -0400 |
---|---|---|
committer | Niv Sardi <xaiki@debian.org> | 2008-07-28 02:58:36 -0400 |
commit | 5163f95a08cbf058ae16452c2242c5600fedc32e (patch) | |
tree | 5d6b905f7031144a62fb1fa17ba3106d99268003 /fs/xfs/xfs_dir2_data.c | |
parent | 68f34d5107dbace3d14a1c2f060fc8941894879c (diff) |
[XFS] Name operation vector for hash and compare
Adds two pieces of functionality for the basis of case-insensitive support
in XFS:
1. A comparison result enumerated type: xfs_dacmp. It represents an
exact match, case-insensitive match or no match at all. This patch
only implements different and exact results.
2. xfs_nameops vector for specifying how to perform the hash generation
of filenames and comparision methods. In this patch the hash vector
points to the existing xfs_da_hashname function and the comparison
method does a length compare, and if the same, does a memcmp and
return the xfs_dacmp result.
All filename functions that use the hash (create, lookup remove, rename,
etc) now use the xfs_nameops.hashname function and all directory lookup
functions also use the xfs_nameops.compname function.
The lookup functions also handle case-insensitive results even though the
default comparison function cannot return that. And important aspect of
the lookup functions is that an exact match always has precedence over a
case-insensitive. So while a case-insensitive match is found, we have to
keep looking just in case there is an exact match. In the meantime, the
info for the first case-insensitive match is retained if no exact match is
found.
SGI-PV: 981519
SGI-Modid: xfs-linux-melb:xfs-kern:31205a
Signed-off-by: Barry Naujok <bnaujok@sgi.com>
Signed-off-by: Christoph Hellwig <hch@infradead.org>
Diffstat (limited to 'fs/xfs/xfs_dir2_data.c')
-rw-r--r-- | fs/xfs/xfs_dir2_data.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/fs/xfs/xfs_dir2_data.c b/fs/xfs/xfs_dir2_data.c index fb8c9e08b23d..498f8d694330 100644 --- a/fs/xfs/xfs_dir2_data.c +++ b/fs/xfs/xfs_dir2_data.c | |||
@@ -65,6 +65,7 @@ xfs_dir2_data_check( | |||
65 | xfs_mount_t *mp; /* filesystem mount point */ | 65 | xfs_mount_t *mp; /* filesystem mount point */ |
66 | char *p; /* current data position */ | 66 | char *p; /* current data position */ |
67 | int stale; /* count of stale leaves */ | 67 | int stale; /* count of stale leaves */ |
68 | struct xfs_name name; | ||
68 | 69 | ||
69 | mp = dp->i_mount; | 70 | mp = dp->i_mount; |
70 | d = bp->data; | 71 | d = bp->data; |
@@ -140,7 +141,9 @@ xfs_dir2_data_check( | |||
140 | addr = xfs_dir2_db_off_to_dataptr(mp, mp->m_dirdatablk, | 141 | addr = xfs_dir2_db_off_to_dataptr(mp, mp->m_dirdatablk, |
141 | (xfs_dir2_data_aoff_t) | 142 | (xfs_dir2_data_aoff_t) |
142 | ((char *)dep - (char *)d)); | 143 | ((char *)dep - (char *)d)); |
143 | hash = xfs_da_hashname((char *)dep->name, dep->namelen); | 144 | name.name = dep->name; |
145 | name.len = dep->namelen; | ||
146 | hash = mp->m_dirnameops->hashname(&name); | ||
144 | for (i = 0; i < be32_to_cpu(btp->count); i++) { | 147 | for (i = 0; i < be32_to_cpu(btp->count); i++) { |
145 | if (be32_to_cpu(lep[i].address) == addr && | 148 | if (be32_to_cpu(lep[i].address) == addr && |
146 | be32_to_cpu(lep[i].hashval) == hash) | 149 | be32_to_cpu(lep[i].hashval) == hash) |