aboutsummaryrefslogtreecommitdiffstats
path: root/mm/shmem.c
diff options
context:
space:
mode:
Diffstat (limited to 'mm/shmem.c')
-rw-r--r--mm/shmem.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/mm/shmem.c b/mm/shmem.c
index 154243f0a27c..9bc4a2353944 100644
--- a/mm/shmem.c
+++ b/mm/shmem.c
@@ -2175,7 +2175,6 @@ static void shmem_put_super(struct super_block *sb)
2175int shmem_fill_super(struct super_block *sb, void *data, int silent) 2175int shmem_fill_super(struct super_block *sb, void *data, int silent)
2176{ 2176{
2177 struct inode *inode; 2177 struct inode *inode;
2178 struct dentry *root;
2179 struct shmem_sb_info *sbinfo; 2178 struct shmem_sb_info *sbinfo;
2180 int err = -ENOMEM; 2179 int err = -ENOMEM;
2181 2180
@@ -2232,10 +2231,9 @@ int shmem_fill_super(struct super_block *sb, void *data, int silent)
2232 goto failed; 2231 goto failed;
2233 inode->i_uid = sbinfo->uid; 2232 inode->i_uid = sbinfo->uid;
2234 inode->i_gid = sbinfo->gid; 2233 inode->i_gid = sbinfo->gid;
2235 root = d_make_root(inode); 2234 sb->s_root = d_make_root(inode);
2236 if (!root) 2235 if (!sb->s_root)
2237 goto failed; 2236 goto failed;
2238 sb->s_root = root;
2239 return 0; 2237 return 0;
2240 2238
2241failed: 2239failed: