Commit 97b1f9aa authored by Fabian Frederick's avatar Fabian Frederick Committed by J. Bruce Fields

nfsd: use swap() in sort_pacl_range()

Use kernel.h macro definition.

Thanks to Julia Lawall for Coccinelle scripting support.
Signed-off-by: default avatarFabian Frederick <fabf@skynet.be>
Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
parent ffe1f0df
...@@ -372,7 +372,6 @@ pace_gt(struct posix_acl_entry *pace1, struct posix_acl_entry *pace2) ...@@ -372,7 +372,6 @@ pace_gt(struct posix_acl_entry *pace1, struct posix_acl_entry *pace2)
static void static void
sort_pacl_range(struct posix_acl *pacl, int start, int end) { sort_pacl_range(struct posix_acl *pacl, int start, int end) {
int sorted = 0, i; int sorted = 0, i;
struct posix_acl_entry tmp;
/* We just do a bubble sort; easy to do in place, and we're not /* We just do a bubble sort; easy to do in place, and we're not
* expecting acl's to be long enough to justify anything more. */ * expecting acl's to be long enough to justify anything more. */
...@@ -382,9 +381,8 @@ sort_pacl_range(struct posix_acl *pacl, int start, int end) { ...@@ -382,9 +381,8 @@ sort_pacl_range(struct posix_acl *pacl, int start, int end) {
if (pace_gt(&pacl->a_entries[i], if (pace_gt(&pacl->a_entries[i],
&pacl->a_entries[i+1])) { &pacl->a_entries[i+1])) {
sorted = 0; sorted = 0;
tmp = pacl->a_entries[i]; swap(pacl->a_entries[i],
pacl->a_entries[i] = pacl->a_entries[i+1]; pacl->a_entries[i + 1]);
pacl->a_entries[i+1] = tmp;
} }
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment