diff options
| author | Al Viro | 2012-02-13 04:08:01 +0100 |
|---|---|---|
| committer | Al Viro | 2012-03-21 02:29:37 +0100 |
| commit | 318ceed088497d1ca839b1172518ac4cc7096b82 (patch) | |
| tree | 7dfd07bfb5e8c5d5dbb0ba4ea523f334c98c66bb /mm/shmem.c | |
| parent | minixfs: switch to d_make_root() (diff) | |
| download | kernel-qcow2-linux-318ceed088497d1ca839b1172518ac4cc7096b82.tar.gz kernel-qcow2-linux-318ceed088497d1ca839b1172518ac4cc7096b82.tar.xz kernel-qcow2-linux-318ceed088497d1ca839b1172518ac4cc7096b82.zip | |
tidy up after d_make_root() conversion
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'mm/shmem.c')
| -rw-r--r-- | mm/shmem.c | 6 |
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) int shmem_fill_super(struct super_block *sb, void *data, int silent) { struct inode *inode; - struct dentry *root; struct shmem_sb_info *sbinfo; int err = -ENOMEM; @@ -2232,10 +2231,9 @@ int shmem_fill_super(struct super_block *sb, void *data, int silent) goto failed; inode->i_uid = sbinfo->uid; inode->i_gid = sbinfo->gid; - root = d_make_root(inode); - if (!root) + sb->s_root = d_make_root(inode); + if (!sb->s_root) goto failed; - sb->s_root = root; return 0; failed: |