diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-06 00:42:54 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-06 00:42:54 +0400 |
| commit | 749d229761ff0135cc4e16b8a28b41ae2f6b2c35 (patch) | |
| tree | 25551c8cfb38319211f5ee59e78462a0f6fb85c4 /fs/9p/vfs_super.c | |
| parent | 795d580baec0d5386b83a8b557df47c20810e86b (diff) | |
| parent | 3dc9fef67f6292692dba181a6d0fd0211bd0a607 (diff) | |
| download | linux-749d229761ff0135cc4e16b8a28b41ae2f6b2c35.tar.xz | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs:
9p: saving negative to unsigned char
9p: return on mutex_lock_interruptible()
9p: Creating files with names too long should fail with ENAMETOOLONG.
9p: Make sure we are able to clunk the cached fid on umount
9p: drop nlink remove
fs/9p: Clunk the fid resulting from partial walk of the name
9p: documentation update
9p: Fix setting of protocol flags in v9fs_session_info structure.
Diffstat (limited to 'fs/9p/vfs_super.c')
| -rw-r--r-- | fs/9p/vfs_super.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/9p/vfs_super.c b/fs/9p/vfs_super.c index a271549d9e21..491108bd6e0d 100644 --- a/fs/9p/vfs_super.c +++ b/fs/9p/vfs_super.c @@ -194,6 +194,7 @@ static void v9fs_kill_super(struct super_block *s) kill_anon_super(s); + v9fs_session_cancel(v9ses); v9fs_session_close(v9ses); kfree(v9ses); s->s_fs_info = NULL; @@ -206,7 +207,7 @@ v9fs_umount_begin(struct super_block *sb) struct v9fs_session_info *v9ses; v9ses = sb->s_fs_info; - v9fs_session_cancel(v9ses); + v9fs_session_begin_cancel(v9ses); } static const struct super_operations v9fs_super_ops = { |