Merge branch 'yem-kconfig-rc-fixes' of git://gitorious.org/linux-kconfig/linux-kconfi...

[karo-tx-linux.git] / fs / 9p / v9fs.h

diff --git a/fs/9p/v9fs.h b/fs/9p/v9fs.h
index 34c59f14a1c9d9b4deea3f8fa3a55830813d3498..a8e127c896271143596aa5db8e001351c7134e6f 100644 (file)
--- a/fs/9p/v9fs.h
+++ b/fs/9p/v9fs.h
@@ -109,9 +109,9 @@ struct v9fs_session_info {
        char *uname;            /* user name to mount as */
        char *aname;            /* name of remote hierarchy being mounted */
        unsigned int maxdata;   /* max data for client interface */
-       unsigned int dfltuid;   /* default uid/muid for legacy support */
-       unsigned int dfltgid;   /* default gid for legacy support */
-       u32 uid;                /* if ACCESS_SINGLE, the uid that has access */
+       kuid_t dfltuid;         /* default uid/muid for legacy support */
+       kgid_t dfltgid;         /* default gid for legacy support */
+       kuid_t uid;             /* if ACCESS_SINGLE, the uid that has access */
        struct p9_client *clnt; /* 9p client */
        struct list_head slist; /* list of sessions registered with v9fs */
        struct backing_dev_info bdi;
@@ -165,8 +165,8 @@ extern struct inode *v9fs_inode_from_fid_dotl(struct v9fs_session_info *v9ses,
 #define V9FS_PORT      564
 #define V9FS_DEFUSER   "nobody"
 #define V9FS_DEFANAME  ""
-#define V9FS_DEFUID    (-2)
-#define V9FS_DEFGID    (-2)
+#define V9FS_DEFUID    KUIDT_INIT(-2)
+#define V9FS_DEFGID    KGIDT_INIT(-2)
 
 static inline struct v9fs_session_info *v9fs_inode2v9ses(struct inode *inode)
 {