From b78e56d75473094b3a52e2ca7264cd7a9cc61d88 Mon Sep 17 00:00:00 2001 From: "Eric W. Biederman" Date: Tue, 7 Feb 2012 16:32:04 -0800 Subject: [PATCH] --- yaml --- r: 327275 b: refs/heads/master c: 32d639c66e04149d490093f8b4b49cb922bfe294 h: refs/heads/master i: 327273: 3f94a3673af8cf3e2480a0e7416e35fbd53a16d8 327271: 6341baded242e56160d37163aa6512d4f289311d v: v3 --- [refs] | 2 +- trunk/drivers/usb/gadget/inode.c | 4 ++-- trunk/init/Kconfig | 1 - 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 17fd7d8fcdf4..b8c21eaeb935 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 170782eb89462d30302cec12378253115b492b38 +refs/heads/master: 32d639c66e04149d490093f8b4b49cb922bfe294 diff --git a/trunk/drivers/usb/gadget/inode.c b/trunk/drivers/usb/gadget/inode.c index e58b16442971..7bd36c80be5f 100644 --- a/trunk/drivers/usb/gadget/inode.c +++ b/trunk/drivers/usb/gadget/inode.c @@ -1988,8 +1988,8 @@ gadgetfs_make_inode (struct super_block *sb, if (inode) { inode->i_ino = get_next_ino(); inode->i_mode = mode; - inode->i_uid = default_uid; - inode->i_gid = default_gid; + inode->i_uid = make_kuid(&init_user_ns, default_uid); + inode->i_gid = make_kgid(&init_user_ns, default_gid); inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME; inode->i_private = data; diff --git a/trunk/init/Kconfig b/trunk/init/Kconfig index 60bdff259b27..633bde28c8ce 100644 --- a/trunk/init/Kconfig +++ b/trunk/init/Kconfig @@ -932,7 +932,6 @@ config UIDGID_CONVERTED depends on NET_9P = n # Filesystems - depends on USB_GADGETFS = n depends on USB_FUNCTIONFS = n depends on DEVTMPFS = n depends on XENFS = n