From 0f036362792feeee438b90c7af4128c5b5f18c39 Mon Sep 17 00:00:00 2001 From: David Howells Date: Wed, 27 Aug 2008 14:48:32 +0100 Subject: [PATCH] --- yaml --- r: 116007 b: refs/heads/master c: 3fc678a0e63138f56109ea31850f19b2e29c45b8 h: refs/heads/master i: 116005: 4ff04d8658edcca0ea56dde7f78708c9a48961c8 116003: ee936412245979f4a831d55e5346736ad04c1939 115999: 2bd8a850fb8e13dab04e6dafb3a6510c6f6799d1 v: v3 --- [refs] | 2 +- trunk/fs/jffs2/fs.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 0683be22284d..ddbe82b29b1e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9d7548d4ca3c52ecb58f098a32b0756cdf8f96ee +refs/heads/master: 3fc678a0e63138f56109ea31850f19b2e29c45b8 diff --git a/trunk/fs/jffs2/fs.c b/trunk/fs/jffs2/fs.c index 89e9b735d8df..249305d65d5b 100644 --- a/trunk/fs/jffs2/fs.c +++ b/trunk/fs/jffs2/fs.c @@ -442,14 +442,14 @@ struct inode *jffs2_new_inode (struct inode *dir_i, int mode, struct jffs2_raw_i memset(ri, 0, sizeof(*ri)); /* Set OS-specific defaults for new inodes */ - ri->uid = cpu_to_je16(current->fsuid); + ri->uid = cpu_to_je16(current_fsuid()); if (dir_i->i_mode & S_ISGID) { ri->gid = cpu_to_je16(dir_i->i_gid); if (S_ISDIR(mode)) mode |= S_ISGID; } else { - ri->gid = cpu_to_je16(current->fsgid); + ri->gid = cpu_to_je16(current_fsgid()); } /* POSIX ACLs have to be processed now, at least partly.