From 9dbdccd0e877053b28ee5dad4cee5486a83a6a80 Mon Sep 17 00:00:00 2001 From: "Eric W. Biederman" Date: Fri, 10 Feb 2012 11:06:08 -0800 Subject: [PATCH] --- yaml --- r: 327282 b: refs/heads/master c: a7d9cfe97b450b27c82e6e41b2fde6214708560d h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/cramfs/inode.c | 4 ++-- trunk/init/Kconfig | 1 - 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 4656c7ee6a5b..bb5d697779c9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 31aba059bb9522ff730301a7d567117fcff0952c +refs/heads/master: a7d9cfe97b450b27c82e6e41b2fde6214708560d diff --git a/trunk/fs/cramfs/inode.c b/trunk/fs/cramfs/inode.c index 28cca01ca9c9..c6c3f91ecf06 100644 --- a/trunk/fs/cramfs/inode.c +++ b/trunk/fs/cramfs/inode.c @@ -90,8 +90,8 @@ static struct inode *get_cramfs_inode(struct super_block *sb, } inode->i_mode = cramfs_inode->mode; - inode->i_uid = cramfs_inode->uid; - inode->i_gid = cramfs_inode->gid; + i_uid_write(inode, cramfs_inode->uid); + i_gid_write(inode, cramfs_inode->gid); /* if the lower 2 bits are zero, the inode contains data */ if (!(inode->i_ino & 3)) { diff --git a/trunk/init/Kconfig b/trunk/init/Kconfig index d9bb344140d0..5f846b57a750 100644 --- a/trunk/init/Kconfig +++ b/trunk/init/Kconfig @@ -941,7 +941,6 @@ config UIDGID_CONVERTED depends on CEPH_FS = n depends on CIFS = n depends on CODA_FS = n - depends on CRAMFS = n depends on ECRYPT_FS = n depends on EFS_FS = n depends on EXOFS_FS = n