Use kernel.h macro definition.

Thanks to Julia Lawall for Coccinelle scripting support.

Signed-off-by: Fabian Frederick <f...@skynet.be>
---
 fs/nfsd/nfs4acl.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/fs/nfsd/nfs4acl.c b/fs/nfsd/nfs4acl.c
index 7e10e2a..eb5accf 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]);
                        }
                }
        }
-- 
2.4.2

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to