diff options
| author | David S. Miller <davem@davemloft.net> | 2009-03-29 04:40:34 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-03-29 04:40:34 -0400 |
| commit | 13223cb02ccfa375f2d683d08d30db5b72264f1e (patch) | |
| tree | d3fc7d803d22bbfe03b96cf0ba38041d42c8a1c2 /fs/proc/root.c | |
| parent | 1383bdb98c01bbd28d72336d1bf614ce79114d29 (diff) | |
| parent | 07d43ba98621f08e252a48c96b258b4d572b0257 (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'fs/proc/root.c')
| -rw-r--r-- | fs/proc/root.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/proc/root.c b/fs/proc/root.c index f6299a25594e..1e15a2b176e8 100644 --- a/fs/proc/root.c +++ b/fs/proc/root.c | |||
| @@ -83,7 +83,8 @@ static int proc_get_sb(struct file_system_type *fs_type, | |||
| 83 | ns->proc_mnt = mnt; | 83 | ns->proc_mnt = mnt; |
| 84 | } | 84 | } |
| 85 | 85 | ||
| 86 | return simple_set_mnt(mnt, sb); | 86 | simple_set_mnt(mnt, sb); |
| 87 | return 0; | ||
| 87 | } | 88 | } |
| 88 | 89 | ||
| 89 | static void proc_kill_sb(struct super_block *sb) | 90 | static void proc_kill_sb(struct super_block *sb) |