Merge branch 'next' into for-linus

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / fs / cifs / cifsglob.h

diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h
index e6899cea1c3580e6e9217f9cb3f0ff68e8d7626c..4f07f6fbe4944c5e6f8bdf12c30b4eaed9397976 100644 (file)
--- a/fs/cifs/cifsglob.h
+++ b/fs/cifs/cifsglob.h
@@ -400,11 +400,11 @@ struct smb_vol {
        char *iocharset;  /* local code page for mapping to and from Unicode */
        char source_rfc1001_name[RFC1001_NAME_LEN_WITH_NULL]; /* clnt nb name */
        char target_rfc1001_name[RFC1001_NAME_LEN_WITH_NULL]; /* srvr nb name */
-       uid_t cred_uid;
-       uid_t linux_uid;
-       gid_t linux_gid;
-       uid_t backupuid;
-       gid_t backupgid;
+       kuid_t cred_uid;
+       kuid_t linux_uid;
+       kgid_t linux_gid;
+       kuid_t backupuid;
+       kgid_t backupgid;
        umode_t file_mode;
        umode_t dir_mode;
        unsigned secFlg;
@@ -703,8 +703,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? */
@@ -838,7 +838,7 @@ struct cifs_tcon {
  */
 struct tcon_link {
        struct rb_node          tl_rbnode;
-       uid_t                   tl_uid;
+       kuid_t                  tl_uid;
        unsigned long           tl_flags;
 #define TCON_LINK_MASTER       0
 #define TCON_LINK_PENDING      1
@@ -931,7 +931,7 @@ struct cifsFileInfo {
        struct list_head tlist; /* pointer to next fid owned by tcon */
        struct list_head flist; /* next fid (file instance) for this inode */
        struct cifs_fid_locks *llist;   /* brlocks held by this fid */
-       unsigned int uid;       /* allows finding which FileInfo structure */
+       kuid_t uid;             /* allows finding which FileInfo structure */
        __u32 pid;              /* process id who opened file */
        struct cifs_fid fid;    /* file id from remote */
        /* BB add lock scope info here if needed */ ;
@@ -1245,8 +1245,8 @@ struct cifs_fattr {
        u64             cf_eof;
        u64             cf_bytes;
        u64             cf_createtime;
-       uid_t           cf_uid;
-       gid_t           cf_gid;
+       kuid_t          cf_uid;
+       kgid_t          cf_gid;
        umode_t         cf_mode;
        dev_t           cf_rdev;
        unsigned int    cf_nlink;