p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

nfsd: use swap() in sort_pacl_range() 

Use kernel.h macro definition.

Thanks to Julia Lawall for Coccinelle scripting support.

Signed-off-by: Fabian Frederick <fabf@skynet.be>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
This commit is contained in:
Fabian Frederick 2015-06-12 18:58:57 +02:00 committed by J. Bruce Fields
parent ffe1f0df58
commit 97b1f9aae9
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fs/nfsd/nfs4acl.c
View File

@ -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) {
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;
} }
} }
} }