cifs: Convert struct cifs_ses to use a kuid_t and a kgid_t

Cc: Steve French <smfrench@gmail.com>
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>

diff --git a/fs/cifs/cifs_spnego.c b/fs/cifs/cifs_spnego.c
index 086f381d648954c4001542be40b3ba6beffbceb0..10e7747612992bcc25706851c9027762e2fc134d 100644 (file)
--- a/fs/cifs/cifs_spnego.c
+++ b/fs/cifs/cifs_spnego.c
@@ -149,10 +149,12 @@ cifs_get_spnego_key(struct cifs_ses *sesInfo)
                goto out;
 
        dp = description + strlen(description);
-       sprintf(dp, ";uid=0x%x", sesInfo->linux_uid);
+       sprintf(dp, ";uid=0x%x",
+               from_kuid_munged(&init_user_ns, sesInfo->linux_uid));
 
        dp = description + strlen(description);
-       sprintf(dp, ";creduid=0x%x", sesInfo->cred_uid);
+       sprintf(dp, ";creduid=0x%x",
+               from_kuid_munged(&init_user_ns, sesInfo->cred_uid));
 
        if (sesInfo->user_name) {
                dp = description + strlen(description);

diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h
index e308e8bd0772dc439f6686534b3bbccafd72e6f5..aaef57beba0e895fc3cc291932b05efc8f2c6750 100644 (file)
--- a/fs/cifs/cifsglob.h
+++ b/fs/cifs/cifsglob.h
@@ -702,8 +702,8 @@ struct cifs_ses {
        char *serverNOS;        /* name of network operating system of server */
        char *serverDomain;     /* security realm of server */
        __u64 Suid;             /* remote smb uid  */
-       uid_t linux_uid;        /* overriding owner of files on the mount */
-       uid_t cred_uid;         /* owner of credentials */
+       kuid_t linux_uid;       /* overriding owner of files on the mount */
+       kuid_t cred_uid;        /* owner of credentials */
        unsigned int capabilities;
        char serverName[SERVER_NAME_LEN_WITH_NULL * 2]; /* BB make bigger for
                                TCP names - will ipv6 and sctp addresses fit? */

diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c
index 01279b8f5d1fb955a292e9e0b7cccacb2986bde3..067b0e169fe4ddbfab0402022cd5c38ba27bcf44 100644 (file)
--- a/fs/cifs/connect.c
+++ b/fs/cifs/connect.c
@@ -2271,7 +2271,7 @@ static int match_session(struct cifs_ses *ses, struct smb_vol *vol)
 {
        switch (ses->server->secType) {
        case Kerberos:
-               if (vol->cred_uid != ses->cred_uid)
+               if (!uid_eq(vol->cred_uid, ses->cred_uid))
                        return 0;
                break;
        default: