Browse Source

userns: Convert xenfs to use kuid and kgid where appropriate

Cc: Ian Campbell <ian.campbell@citrix.com>
Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Acked-by: Serge Hallyn <serge.hallyn@canonical.com>
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Eric W. Biederman 13 years ago
parent
commit
9a11f4513c
2 changed files with 2 additions and 3 deletions
  1. 2 1
      drivers/xen/xenfs/super.c
  2. 0 2
      init/Kconfig

+ 2 - 1
drivers/xen/xenfs/super.c

@@ -30,7 +30,8 @@ static struct inode *xenfs_make_inode(struct super_block *sb, int mode)
 
 
 	if (ret) {
 	if (ret) {
 		ret->i_mode = mode;
 		ret->i_mode = mode;
-		ret->i_uid = ret->i_gid = 0;
+		ret->i_uid = GLOBAL_ROOT_UID;
+		ret->i_gid = GLOBAL_ROOT_GID;
 		ret->i_blocks = 0;
 		ret->i_blocks = 0;
 		ret->i_atime = ret->i_mtime = ret->i_ctime = CURRENT_TIME;
 		ret->i_atime = ret->i_mtime = ret->i_ctime = CURRENT_TIME;
 	}
 	}

+ 0 - 2
init/Kconfig

@@ -932,8 +932,6 @@ config UIDGID_CONVERTED
 	depends on NET_9P = n
 	depends on NET_9P = n
 
 
 	# Filesystems
 	# Filesystems
-	depends on XENFS = n
-
 	depends on 9P_FS = n
 	depends on 9P_FS = n
 	depends on ADFS_FS = n
 	depends on ADFS_FS = n
 	depends on AFFS_FS = n
 	depends on AFFS_FS = n