diff options
author | Nathan Scott <nathans@sgi.com> | 2005-11-02 11:43:18 +1100 |
---|---|---|
committer | Nathan Scott <nathans@sgi.com> | 2005-11-02 11:43:18 +1100 |
commit | 380b5dc0e59340e7ed36dcc95dd1022aca75bbe2 (patch) | |
tree | 78e298c775b637e7dc0029bc5ecfc28db9256038 /fs/xfs/xfs_acl.c | |
parent | 80cce77980c645b1c129d0e90159c1b1bb78f6a6 (diff) | |
download | op-kernel-dev-380b5dc0e59340e7ed36dcc95dd1022aca75bbe2.zip op-kernel-dev-380b5dc0e59340e7ed36dcc95dd1022aca75bbe2.tar.gz |
[XFS] Fix up an internal sort function name collision issue.
SGI-PV: 942986
SGI-Modid: xfs-linux:xfs-kern:23859a
Signed-off-by: Nathan Scott <nathans@sgi.com>
Diffstat (limited to 'fs/xfs/xfs_acl.c')
-rw-r--r-- | fs/xfs/xfs_acl.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/xfs/xfs_acl.c b/fs/xfs/xfs_acl.c index 92fd1d6..49fdc39 100644 --- a/fs/xfs/xfs_acl.c +++ b/fs/xfs/xfs_acl.c @@ -155,7 +155,7 @@ posix_acl_xattr_to_xfs( } /* - * Comparison function called from qsort(). + * Comparison function called from xfs_sort(). * Primary key is ae_tag, secondary key is ae_id. */ STATIC int @@ -189,8 +189,8 @@ posix_acl_xfs_to_xattr( return -ERANGE; /* Need to sort src XFS ACL by <ae_tag,ae_id> */ - qsort(src->acl_entry, src->acl_cnt, sizeof(src->acl_entry[0]), - xfs_acl_entry_compare); + xfs_sort(src->acl_entry, src->acl_cnt, sizeof(src->acl_entry[0]), + xfs_acl_entry_compare); dest->a_version = cpu_to_le32(POSIX_ACL_XATTR_VERSION); dest_entry = &dest->a_entries[0]; |