Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 23150
b: refs/heads/master
c: 984a081
h: refs/heads/master
v: v3
  • Loading branch information
Nathan Scott committed Mar 17, 2006
1 parent ed62e54 commit e89728a
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 11 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 3b244aa81ecb06859e0c16abf4c26404c1d86591
refs/heads/master: 984a081a7c89ea7e1b6f47cbc0e5c8ef67ad6e09
17 changes: 7 additions & 10 deletions trunk/fs/xfs/xfs_attr_leaf.c
Original file line number Diff line number Diff line change
Expand Up @@ -513,11 +513,9 @@ xfs_attr_shortform_compare(const void *a, const void *b)

sa = (xfs_attr_sf_sort_t *)a;
sb = (xfs_attr_sf_sort_t *)b;
if (INT_GET(sa->hash, ARCH_CONVERT)
< INT_GET(sb->hash, ARCH_CONVERT)) {
if (sa->hash < sb->hash) {
return(-1);
} else if (INT_GET(sa->hash, ARCH_CONVERT)
> INT_GET(sb->hash, ARCH_CONVERT)) {
} else if (sa->hash > sb->hash) {
return(1);
} else {
return(sa->entno - sb->entno);
Expand Down Expand Up @@ -631,8 +629,7 @@ xfs_attr_shortform_list(xfs_attr_list_context_t *context)
continue;
}
sbp->entno = i;
INT_SET(sbp->hash, ARCH_CONVERT,
xfs_da_hashname((char *)sfe->nameval, sfe->namelen));
sbp->hash = xfs_da_hashname((char *)sfe->nameval, sfe->namelen);
sbp->name = (char *)sfe->nameval;
sbp->namelen = sfe->namelen;
/* These are bytes, and both on-disk, don't endian-flip */
Expand All @@ -655,12 +652,12 @@ xfs_attr_shortform_list(xfs_attr_list_context_t *context)
cursor->initted = 1;
cursor->blkno = 0;
for (sbp = sbuf, i = 0; i < nsbuf; i++, sbp++) {
if (INT_GET(sbp->hash, ARCH_CONVERT) == cursor->hashval) {
if (sbp->hash == cursor->hashval) {
if (cursor->offset == count) {
break;
}
count++;
} else if (INT_GET(sbp->hash, ARCH_CONVERT) > cursor->hashval) {
} else if (sbp->hash > cursor->hashval) {
break;
}
}
Expand All @@ -680,8 +677,8 @@ xfs_attr_shortform_list(xfs_attr_list_context_t *context)
((sbp->flags & XFS_ATTR_ROOT) ? &attr_trusted :
&attr_user);

if (cursor->hashval != INT_GET(sbp->hash, ARCH_CONVERT)) {
cursor->hashval = INT_GET(sbp->hash, ARCH_CONVERT);
if (cursor->hashval != sbp->hash) {
cursor->hashval = sbp->hash;
cursor->offset = 0;
}
if (context->flags & ATTR_KERNOVAL) {
Expand Down

0 comments on commit e89728a

Please sign in to comment.