diff options
| author | Fabian Frederick <fabf@skynet.be> | 2015-06-12 18:58:57 +0200 |
|---|---|---|
| committer | J. Bruce Fields <bfields@redhat.com> | 2015-06-19 15:39:50 -0400 |
| commit | 97b1f9aae963cc0b229ef8147db4782170564d4f (patch) | |
| tree | 6609b398748f94c528c213c86eb62142571824b4 /fs/nfsd | |
| parent | ffe1f0df586237a18f9b568597bddabb56e96d5e (diff) | |
| download | linux-stable-97b1f9aae963cc0b229ef8147db4782170564d4f.tar.gz linux-stable-97b1f9aae963cc0b229ef8147db4782170564d4f.tar.bz2 linux-stable-97b1f9aae963cc0b229ef8147db4782170564d4f.zip | |
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>
Diffstat (limited to 'fs/nfsd')
| -rw-r--r-- | fs/nfsd/nfs4acl.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/fs/nfsd/nfs4acl.c b/fs/nfsd/nfs4acl.c index 7e10e2a6c977..eb5accf1b37f 100644 --- a/fs/nfsd/nfs4acl.c +++ b/fs/nfsd/nfs4acl.c @@ -372,7 +372,6 @@ pace_gt(struct posix_acl_entry *pace1, struct posix_acl_entry *pace2) static void sort_pacl_range(struct posix_acl *pacl, int start, int end) { int sorted = 0, i; - struct posix_acl_entry tmp; /* 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. */ @@ -382,9 +381,8 @@ sort_pacl_range(struct posix_acl *pacl, int start, int end) { if (pace_gt(&pacl->a_entries[i], &pacl->a_entries[i+1])) { sorted = 0; - tmp = pacl->a_entries[i]; - pacl->a_entries[i] = pacl->a_entries[i+1]; - pacl->a_entries[i+1] = tmp; + swap(pacl->a_entries[i], + pacl->a_entries[i + 1]); } } } |