diff options
author | Nathan Scott <nathans@sgi.com> | 2005-11-01 19:43:18 -0500 |
---|---|---|
committer | Nathan Scott <nathans@sgi.com> | 2005-11-01 19:43:18 -0500 |
commit | 380b5dc0e59340e7ed36dcc95dd1022aca75bbe2 (patch) | |
tree | 78e298c775b637e7dc0029bc5ecfc28db9256038 /fs/xfs/xfs_acl.c | |
parent | 80cce77980c645b1c129d0e90159c1b1bb78f6a6 (diff) |
[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 92fd1d67f878..49fdc392fc8a 100644 --- a/fs/xfs/xfs_acl.c +++ b/fs/xfs/xfs_acl.c | |||
@@ -155,7 +155,7 @@ posix_acl_xattr_to_xfs( | |||
155 | } | 155 | } |
156 | 156 | ||
157 | /* | 157 | /* |
158 | * Comparison function called from qsort(). | 158 | * Comparison function called from xfs_sort(). |
159 | * Primary key is ae_tag, secondary key is ae_id. | 159 | * Primary key is ae_tag, secondary key is ae_id. |
160 | */ | 160 | */ |
161 | STATIC int | 161 | STATIC int |
@@ -189,8 +189,8 @@ posix_acl_xfs_to_xattr( | |||
189 | return -ERANGE; | 189 | return -ERANGE; |
190 | 190 | ||
191 | /* Need to sort src XFS ACL by <ae_tag,ae_id> */ | 191 | /* Need to sort src XFS ACL by <ae_tag,ae_id> */ |
192 | qsort(src->acl_entry, src->acl_cnt, sizeof(src->acl_entry[0]), | 192 | xfs_sort(src->acl_entry, src->acl_cnt, sizeof(src->acl_entry[0]), |
193 | xfs_acl_entry_compare); | 193 | xfs_acl_entry_compare); |
194 | 194 | ||
195 | dest->a_version = cpu_to_le32(POSIX_ACL_XATTR_VERSION); | 195 | dest->a_version = cpu_to_le32(POSIX_ACL_XATTR_VERSION); |
196 | dest_entry = &dest->a_entries[0]; | 196 | dest_entry = &dest->a_entries[0]; |