diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-04-05 19:41:22 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-04-05 19:41:22 -0400 |
| commit | 9efe21cb82b5dbe3b0b2ae4de4eccc64ecb94e95 (patch) | |
| tree | 7ff8833745d2f268f897f6fa4a27263b4a572245 /fs/9p/vfs_super.c | |
| parent | de18836e447c2dc30120c0919b8db8ddc0401cc4 (diff) | |
| parent | 0221c81b1b8eb0cbb6b30a0ced52ead32d2b4e4c (diff) | |
Merge branch 'linus' into irq/threaded
Conflicts:
include/linux/irq.h
kernel/irq/handle.c
Diffstat (limited to 'fs/9p/vfs_super.c')
| -rw-r--r-- | fs/9p/vfs_super.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/fs/9p/vfs_super.c b/fs/9p/vfs_super.c index 93212e40221a..5f8ab8adb5f5 100644 --- a/fs/9p/vfs_super.c +++ b/fs/9p/vfs_super.c | |||
| @@ -168,8 +168,9 @@ static int v9fs_get_sb(struct file_system_type *fs_type, int flags, | |||
| 168 | p9stat_free(st); | 168 | p9stat_free(st); |
| 169 | kfree(st); | 169 | kfree(st); |
| 170 | 170 | ||
| 171 | P9_DPRINTK(P9_DEBUG_VFS, " return simple set mount\n"); | 171 | P9_DPRINTK(P9_DEBUG_VFS, " simple set mount, return 0\n"); |
| 172 | return simple_set_mnt(mnt, sb); | 172 | simple_set_mnt(mnt, sb); |
| 173 | return 0; | ||
| 173 | 174 | ||
| 174 | release_sb: | 175 | release_sb: |
| 175 | if (sb) { | 176 | if (sb) { |