diff options
author | Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com> | 2009-03-04 15:06:34 -0500 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2009-03-27 14:44:03 -0400 |
commit | a3ec947c85ec339884b30ef6a08133e9311fdae1 (patch) | |
tree | c3cc5859a6b6d8986547405b6c5bd11bc8916114 /fs/devpts/inode.c | |
parent | 585d3bc06f4ca57f975a5a1f698f65a45ea66225 (diff) |
vfs: simple_set_mnt() should return void
simple_set_mnt() is defined as returning 'int' but always returns 0.
Callers assume simple_set_mnt() never fails and don't properly cleanup if
it were to _ever_ fail. For instance, get_sb_single() and get_sb_nodev()
should:
up_write(sb->s_unmount);
deactivate_super(sb);
if simple_set_mnt() fails.
Since simple_set_mnt() never fails, would be cleaner if it did not
return anything.
[akpm@linux-foundation.org: fix build]
Signed-off-by: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>
Acked-by: Serge Hallyn <serue@us.ibm.com>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Christoph Hellwig <hch@lst.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/devpts/inode.c')
-rw-r--r-- | fs/devpts/inode.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/devpts/inode.c b/fs/devpts/inode.c index 140b43144cd8..b0a76340a4cd 100644 --- a/fs/devpts/inode.c +++ b/fs/devpts/inode.c | |||
@@ -454,7 +454,8 @@ static int get_init_pts_sb(struct file_system_type *fs_type, int flags, | |||
454 | s->s_flags |= MS_ACTIVE; | 454 | s->s_flags |= MS_ACTIVE; |
455 | } | 455 | } |
456 | do_remount_sb(s, flags, data, 0); | 456 | do_remount_sb(s, flags, data, 0); |
457 | return simple_set_mnt(mnt, s); | 457 | simple_set_mnt(mnt, s); |
458 | return 0; | ||
458 | } | 459 | } |
459 | 460 | ||
460 | /* | 461 | /* |