diff options
| author | Abhishek Kulkarni <adkulkar@umail.iu.edu> | 2009-07-19 13:41:52 -0600 |
|---|---|---|
| committer | Eric Van Hensbergen <ericvh@strongmad.austin.ibm.com> | 2009-08-17 16:27:57 -0500 |
| commit | 1b5ab3e86712b6be38ebbe0d821387c1d8f91d7c (patch) | |
| tree | 8c7cc3d58d6bd8f62398de5f963966b7bf58abb9 /fs | |
| parent | 4f4038328da5eb9cc237b51d3fe68138fd3fea14 (diff) | |
| download | linux-1b5ab3e86712b6be38ebbe0d821387c1d8f91d7c.tar.gz linux-1b5ab3e86712b6be38ebbe0d821387c1d8f91d7c.tar.bz2 linux-1b5ab3e86712b6be38ebbe0d821387c1d8f91d7c.zip | |
9p: Fix possible regressions when ->get_sb fails.
->get_sb can fail causing some badness. this patch fixes
* clear sb->fs_s_info in kill_sb.
* deactivate_locked_super() calls kill_sb (v9fs_kill_super) which closes the
destroys the client, clunks all its fids and closes the v9fs session.
Attempting to do it twice will cause an oops.
Signed-off-by: Abhishek Kulkarni <adkulkar@umail.iu.edu>
Signed-off-by: Eric Van Hensbergen <ericvh@gmail.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/9p/vfs_super.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/fs/9p/vfs_super.c b/fs/9p/vfs_super.c index a9d7d08cfbe8..2495af4ad9a6 100644 --- a/fs/9p/vfs_super.c +++ b/fs/9p/vfs_super.c @@ -120,7 +120,6 @@ static int v9fs_get_sb(struct file_system_type *fs_type, int flags, P9_DPRINTK(P9_DEBUG_VFS, " \n"); - st = NULL; v9ses = kzalloc(sizeof(struct v9fs_session_info), GFP_KERNEL); if (!v9ses) return -ENOMEM; @@ -173,10 +172,8 @@ P9_DPRINTK(P9_DEBUG_VFS, " simple set mount, return 0\n"); simple_set_mnt(mnt, sb); return 0; -release_sb: - deactivate_locked_super(sb); - free_stat: + p9stat_free(st); kfree(st); clunk_fid: @@ -185,7 +182,12 @@ clunk_fid: close_session: v9fs_session_close(v9ses); kfree(v9ses); + return retval; +release_sb: + p9stat_free(st); + kfree(st); + deactivate_locked_super(sb); return retval; } @@ -207,6 +209,7 @@ static void v9fs_kill_super(struct super_block *s) v9fs_session_close(v9ses); kfree(v9ses); + s->s_fs_info = NULL; P9_DPRINTK(P9_DEBUG_VFS, "exiting kill_super\n"); } |