diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-03 16:10:25 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-03 16:10:25 -0700 |
| commit | cce2c56e7666199916525907dc817209dd58287c (patch) | |
| tree | 555a0ae78da2148b37c585cd4477047376b0bde9 /fs/logfs | |
| parent | 609cfda586c7fe3e5d1a02c51edb587506294167 (diff) | |
| download | linux-3.10-cce2c56e7666199916525907dc817209dd58287c.tar.gz linux-3.10-cce2c56e7666199916525907dc817209dd58287c.tar.bz2 linux-3.10-cce2c56e7666199916525907dc817209dd58287c.zip | |
logfs: initialize superblock entries earlier
In particular, s_freeing_list needs to be initialized early, since it is
used on some of the error paths when mounts fail. The mapping inode,
for example, would be initialized and then free'd on an error path
before s_freeing_list was initialized, but the inode drop operation
needs the s_freeing_list to be set up.
Normally you'd never see this, because not only is logfs fairly rare,
but a successful mount will never have any issues.
Reported-by: werner <w.landgraf@ru.ru>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/logfs')
| -rw-r--r-- | fs/logfs/super.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/logfs/super.c b/fs/logfs/super.c index 33435e4b14d..ce03a182c77 100644 --- a/fs/logfs/super.c +++ b/fs/logfs/super.c @@ -480,10 +480,6 @@ static int logfs_read_sb(struct super_block *sb, int read_only) !read_only) return -EIO; - mutex_init(&super->s_dirop_mutex); - mutex_init(&super->s_object_alias_mutex); - INIT_LIST_HEAD(&super->s_freeing_list); - ret = logfs_init_rw(sb); if (ret) return ret; @@ -601,6 +597,10 @@ static struct dentry *logfs_mount(struct file_system_type *type, int flags, if (!super) return ERR_PTR(-ENOMEM); + mutex_init(&super->s_dirop_mutex); + mutex_init(&super->s_object_alias_mutex); + INIT_LIST_HEAD(&super->s_freeing_list); + if (!devname) err = logfs_get_sb_bdev(super, type, devname); else if (strncmp(devname, "mtd", 3)) |