From 992956189de58cae9f2be40585bc25105cd7c5ad Mon Sep 17 00:00:00 2001 From: Eric W. Biederman Date: Mon, 17 Dec 2012 17:19:36 -0800 Subject: efi: Fix the build with user namespaces enabled. When compiling efivars.c the build fails with: CC drivers/firmware/efivars.o drivers/firmware/efivars.c: In function ‘efivarfs_get_inode’: drivers/firmware/efivars.c:886:31: error: incompatible types when assigning to type ‘kgid_t’ from type ‘int’ make[2]: *** [drivers/firmware/efivars.o] Error 1 make[1]: *** [drivers/firmware/efivars.o] Error 2 Fix the build error by removing the duplicate initialization of i_uid and i_gid inode_init_always has already initialized them to 0. Signed-off-by: "Eric W. Biederman" Signed-off-by: Linus Torvalds --- drivers/firmware/efivars.c | 1 - 1 file changed, 1 deletion(-) (limited to 'drivers/firmware/efivars.c') diff --git a/drivers/firmware/efivars.c b/drivers/firmware/efivars.c index 52c5d8956d7d..7b1c37497c9a 100644 --- a/drivers/firmware/efivars.c +++ b/drivers/firmware/efivars.c @@ -883,7 +883,6 @@ static struct inode *efivarfs_get_inode(struct super_block *sb, if (inode) { inode->i_ino = get_next_ino(); - inode->i_uid = inode->i_gid = 0; inode->i_mode = mode; inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME; switch (mode & S_IFMT) { -- cgit v1.2.3