sunrpc: Use uid_eq and gid_eq where appropriate

When comparing uids use uid_eq instead of ==.
When comparing gids use gid_eq instead of ==.

And unfortunate cost of type safety.

Cc: "J. Bruce Fields" <bfields@fieldses.org>
Cc: Trond Myklebust <Trond.Myklebust@netapp.com>
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>

diff --git a/net/sunrpc/auth_generic.c b/net/sunrpc/auth_generic.c
index 9d2e0b045596c48854dc83141a11a3f9beaba15f..bff3e4730f6b8f498f99523c8246eb3acf535740 100644 (file)
--- a/net/sunrpc/auth_generic.c
+++ b/net/sunrpc/auth_generic.c
@@ -129,8 +129,8 @@ machine_cred_match(struct auth_cred *acred, struct generic_cred *gcred, int flag
 {
        if (!gcred->acred.machine_cred ||
            gcred->acred.principal != acred->principal ||
-           gcred->acred.uid != acred->uid ||
-           gcred->acred.gid != acred->gid)
+           !uid_eq(gcred->acred.uid, acred->uid) ||
+           !gid_eq(gcred->acred.gid, acred->gid))
                return 0;
        return 1;
 }
@@ -147,8 +147,8 @@ generic_match(struct auth_cred *acred, struct rpc_cred *cred, int flags)
        if (acred->machine_cred)
                return machine_cred_match(acred, gcred, flags);
 
-       if (gcred->acred.uid != acred->uid ||
-           gcred->acred.gid != acred->gid ||
+       if (!uid_eq(gcred->acred.uid, acred->uid) ||
+           !gid_eq(gcred->acred.gid, acred->gid) ||
            gcred->acred.machine_cred != 0)
                goto out_nomatch;
 

diff --git a/net/sunrpc/auth_gss/auth_gss.c b/net/sunrpc/auth_gss/auth_gss.c
index 4daab81ca3372fb54e83530cfcfdb4fd9b9a025f..1b8b3e4fad46b6a79226bde50a5460febb72b730 100644 (file)
--- a/net/sunrpc/auth_gss/auth_gss.c
+++ b/net/sunrpc/auth_gss/auth_gss.c
@@ -307,7 +307,7 @@ __gss_find_upcall(struct rpc_pipe *pipe, kuid_t uid)
 {
        struct gss_upcall_msg *pos;
        list_for_each_entry(pos, &pipe->in_downcall, list) {
-               if (pos->uid != uid)
+               if (!uid_eq(pos->uid, uid))
                        continue;
                atomic_inc(&pos->count);
                dprintk("RPC:       %s found msg %p\n", __func__, pos);
@@ -1115,7 +1115,7 @@ out:
        }
        if (gss_cred->gc_principal != NULL)
                return 0;
-       return rc->cr_uid == acred->uid;
+       return uid_eq(rc->cr_uid, acred->uid);
 }
 
 /*

diff --git a/net/sunrpc/auth_unix.c b/net/sunrpc/auth_unix.c
index 372d9156f6e3aa4b8ae049aeeb20519e836cedaf..8365a9cade98853d574fa6b3609e35c89c8242b1 100644 (file)
--- a/net/sunrpc/auth_unix.c
+++ b/net/sunrpc/auth_unix.c
@@ -123,7 +123,7 @@ unx_match(struct auth_cred *acred, struct rpc_cred *rcred, int flags)
        unsigned int i;
 
 
-       if (cred->uc_uid != acred->uid || cred->uc_gid != acred->gid)
+       if (!uid_eq(cred->uc_uid, acred->uid) || !gid_eq(cred->uc_gid, acred->gid))
                return 0;
 
        if (acred->group_info != NULL)

diff --git a/net/sunrpc/svcauth_unix.c b/net/sunrpc/svcauth_unix.c
index caae662f9fa3c3774e68b29ef8c0196673ef6cdb..92166b57ec7a7cb160e36a7ebaf2f5a94544ad38 100644 (file)
--- a/net/sunrpc/svcauth_unix.c
+++ b/net/sunrpc/svcauth_unix.c
@@ -433,7 +433,7 @@ static int unix_gid_match(struct cache_head *corig, struct cache_head *cnew)
 {
        struct unix_gid *orig = container_of(corig, struct unix_gid, h);
        struct unix_gid *new = container_of(cnew, struct unix_gid, h);
-       return orig->uid == new->uid;
+       return uid_eq(orig->uid, new->uid);
 }
 static void unix_gid_init(struct cache_head *cnew, struct cache_head *citem)
 {