redonkable/remarkable-linux
redonkable/remarkable-linux
1
0
Fork 0
Code Releases Activity

[XFS] Fix CI lookup in leaf-form directories

Browse source 
Instead of comparing buffer pointers, compare buffer block numbers and
don't keep buff

SGI-PV: 983564

SGI-Modid: xfs-linux-melb:xfs-kern:31346a

Signed-off-by: Barry Naujok <bnaujok@sgi.com>
Signed-off-by: Christoph Hellwig <hch@infradead.org>
Signed-off-by: Lachlan McIlroy <lachlan@sgi.com>
This commit is contained in:
Barry Naujok 2008-06-27 13:32:11 +10:00 committed by Niv Sardi
parent f9e09f095f
commit 07fe4dd48d
1 changed files with 25 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
fs/xfs/xfs_dir2_leaf.c
View file

@ -1321,8 +1321,8 @@ xfs_dir2_leaf_lookup_int(
int *indexp, /* out: index in leaf block */ int *indexp, /* out: index in leaf block */
xfs_dabuf_t **dbpp) /* out: data buffer */ xfs_dabuf_t **dbpp) /* out: data buffer */
{ {
xfs_dir2_db_t curdb; /* current data block number */ xfs_dir2_db_t curdb = -1; /* current data block number */
xfs_dabuf_t *dbp; /* data buffer */ xfs_dabuf_t *dbp = NULL; /* data buffer */
xfs_dir2_data_entry_t *dep; /* data entry */ xfs_dir2_data_entry_t *dep; /* data entry */
xfs_inode_t *dp; /* incore directory inode */ xfs_inode_t *dp; /* incore directory inode */
int error; /* error return code */ int error; /* error return code */
@ -1333,7 +1333,7 @@ xfs_dir2_leaf_lookup_int(
xfs_mount_t *mp; /* filesystem mount point */ xfs_mount_t *mp; /* filesystem mount point */
xfs_dir2_db_t newdb; /* new data block number */ xfs_dir2_db_t newdb; /* new data block number */
xfs_trans_t *tp; /* transaction pointer */ xfs_trans_t *tp; /* transaction pointer */
xfs_dabuf_t *cbp; /* case match data buffer */ xfs_dir2_db_t cidb = -1; /* case match data block no. */
enum xfs_dacmp cmp; /* name compare result */ enum xfs_dacmp cmp; /* name compare result */
dp = args->dp; dp = args->dp;
@ -1342,11 +1342,10 @@ xfs_dir2_leaf_lookup_int(
/* /*
* Read the leaf block into the buffer. * Read the leaf block into the buffer.
*/ */
if ((error = error = xfs_da_read_buf(tp, dp, mp->m_dirleafblk, -1, &lbp,
xfs_da_read_buf(tp, dp, mp->m_dirleafblk, -1, &lbp, XFS_DATA_FORK);
XFS_DATA_FORK))) { if (error)
return error; return error;
}
*lbpp = lbp; *lbpp = lbp;
leaf = lbp->data; leaf = lbp->data;
xfs_dir2_leaf_check(dp, lbp); xfs_dir2_leaf_check(dp, lbp);
@ -1358,9 +1357,7 @@ xfs_dir2_leaf_lookup_int(
* Loop over all the entries with the right hash value * Loop over all the entries with the right hash value
* looking to match the name. * looking to match the name.
*/ */
cbp = NULL; for (lep = &leaf->ents[index]; index < be16_to_cpu(leaf->hdr.count) &&
for (lep = &leaf->ents[index], dbp = NULL, curdb = -1;
index < be16_to_cpu(leaf->hdr.count) &&
be32_to_cpu(lep->hashval) == args->hashval; be32_to_cpu(lep->hashval) == args->hashval;
lep++, index++) { lep++, index++) {
/* /*
@ -1377,7 +1374,7 @@ xfs_dir2_leaf_lookup_int(
* need to pitch the old one and read the new one. * need to pitch the old one and read the new one.
*/ */
if (newdb != curdb) { if (newdb != curdb) {
if (dbp != cbp) if (dbp)
xfs_da_brelse(tp, dbp); xfs_da_brelse(tp, dbp);
error = xfs_da_read_buf(tp, dp, error = xfs_da_read_buf(tp, dp,
xfs_dir2_db_to_da(mp, newdb), xfs_dir2_db_to_da(mp, newdb),
@ -1403,35 +1400,39 @@ xfs_dir2_leaf_lookup_int(
if (cmp != XFS_CMP_DIFFERENT && cmp != args->cmpresult) { if (cmp != XFS_CMP_DIFFERENT && cmp != args->cmpresult) {
args->cmpresult = cmp; args->cmpresult = cmp;
*indexp = index; *indexp = index;
/* /* case exact match: return the current buffer. */
* case exact match: release the stored CI buffer if it
* exists and return the current buffer.
*/
if (cmp == XFS_CMP_EXACT) { if (cmp == XFS_CMP_EXACT) {
if (cbp && cbp != dbp)
xfs_da_brelse(tp, cbp);
*dbpp = dbp; *dbpp = dbp;
return 0; return 0;
} }
cbp = dbp; cidb = curdb;
} }
} }
ASSERT(args->op_flags & XFS_DA_OP_OKNOENT); ASSERT(args->op_flags & XFS_DA_OP_OKNOENT);
/* /*
* Here, we can only be doing a lookup (not a rename or replace). * Here, we can only be doing a lookup (not a rename or remove).
* If a case-insensitive match was found earlier, release the current * If a case-insensitive match was found earlier, re-read the
* buffer and return the stored CI matching buffer. * appropriate data block if required and return it.
*/ */
if (args->cmpresult == XFS_CMP_CASE) { if (args->cmpresult == XFS_CMP_CASE) {
if (cbp != dbp) ASSERT(cidb != -1);
if (cidb != curdb) {
xfs_da_brelse(tp, dbp); xfs_da_brelse(tp, dbp);
*dbpp = cbp; error = xfs_da_read_buf(tp, dp,
xfs_dir2_db_to_da(mp, cidb),
-1, &dbp, XFS_DATA_FORK);
if (error) {
xfs_da_brelse(tp, lbp);
return error;
}
}
*dbpp = dbp;
return 0; return 0;
} }
/* /*
* No match found, return ENOENT. * No match found, return ENOENT.
*/ */
ASSERT(cbp == NULL); ASSERT(cidb == -1);
if (dbp) if (dbp)
xfs_da_brelse(tp, dbp); xfs_da_brelse(tp, dbp);
xfs_da_brelse(tp, lbp); xfs_da_brelse(tp, lbp);