diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-06-30 15:23:59 +1000 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-06-30 15:23:59 +1000 |
| commit | 6da49a292534d31ca391928ea97f8225774dc1e0 (patch) | |
| tree | 060c5f5f40dceb10d4528763bc7fc1ccc88210d9 /fs/proc/root.c | |
| parent | 17bdc6c0e979ae61879806e4dd93ec3b169d0931 (diff) | |
| parent | ca56a95eedcc95f8fea7b49c87565cd961d74fe2 (diff) | |
| download | kernel_goldelico_gta04-6da49a292534d31ca391928ea97f8225774dc1e0.zip kernel_goldelico_gta04-6da49a292534d31ca391928ea97f8225774dc1e0.tar.gz kernel_goldelico_gta04-6da49a292534d31ca391928ea97f8225774dc1e0.tar.bz2 | |
Merge remote branch 'origin/master' into next
Diffstat (limited to 'fs/proc/root.c')
| -rw-r--r-- | fs/proc/root.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/fs/proc/root.c b/fs/proc/root.c index a9000e9..d6c3b41 100644 --- a/fs/proc/root.c +++ b/fs/proc/root.c @@ -28,11 +28,12 @@ static int proc_test_super(struct super_block *sb, void *data) static int proc_set_super(struct super_block *sb, void *data) { - struct pid_namespace *ns; - - ns = (struct pid_namespace *)data; - sb->s_fs_info = get_pid_ns(ns); - return set_anon_super(sb, NULL); + int err = set_anon_super(sb, NULL); + if (!err) { + struct pid_namespace *ns = (struct pid_namespace *)data; + sb->s_fs_info = get_pid_ns(ns); + } + return err; } static struct dentry *proc_mount(struct file_system_type *fs_type, |