diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2011-06-17 09:27:16 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2011-06-24 18:39:42 -0400 |
commit | 2a9b99516c662d1713d58648e4a4c9aef72051bc (patch) | |
tree | 3c85e9cbe43af86d647b3c4d658955c82dc5fb7f /fs | |
parent | 2ced6f693581357b2a5bf8b031a702c624b12d0d (diff) |
sanitize cifs_umount() prototype
a) superblock argument is unused
b) it always returns 0
Acked-by: Pavel Shilovsky <piastryyy@gmail.com>
Reviewed-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs')
-rw-r--r-- | fs/cifs/cifsfs.c | 6 | ||||
-rw-r--r-- | fs/cifs/cifsproto.h | 2 | ||||
-rw-r--r-- | fs/cifs/connect.c | 5 |
3 files changed, 5 insertions, 8 deletions
diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c index 61c7aa870f1..2af14d4577a 100644 --- a/fs/cifs/cifsfs.c +++ b/fs/cifs/cifsfs.c | |||
@@ -172,7 +172,7 @@ out_no_root: | |||
172 | if (inode) | 172 | if (inode) |
173 | iput(inode); | 173 | iput(inode); |
174 | 174 | ||
175 | cifs_umount(sb, cifs_sb); | 175 | cifs_umount(cifs_sb); |
176 | return rc; | 176 | return rc; |
177 | } | 177 | } |
178 | 178 | ||
@@ -189,9 +189,7 @@ cifs_put_super(struct super_block *sb) | |||
189 | return; | 189 | return; |
190 | } | 190 | } |
191 | 191 | ||
192 | rc = cifs_umount(sb, cifs_sb); | 192 | cifs_umount(cifs_sb); |
193 | if (rc) | ||
194 | cERROR(1, "cifs_umount failed with return code %d", rc); | ||
195 | } | 193 | } |
196 | 194 | ||
197 | static void cifs_kill_sb(struct super_block *sb) | 195 | static void cifs_kill_sb(struct super_block *sb) |
diff --git a/fs/cifs/cifsproto.h b/fs/cifs/cifsproto.h index 5814fe543f9..257f312ede4 100644 --- a/fs/cifs/cifsproto.h +++ b/fs/cifs/cifsproto.h | |||
@@ -158,7 +158,7 @@ extern void cifs_cleanup_volume_info(struct smb_vol **pvolume_info); | |||
158 | extern int cifs_setup_volume_info(struct smb_vol **pvolume_info, | 158 | extern int cifs_setup_volume_info(struct smb_vol **pvolume_info, |
159 | char *mount_data, const char *devname); | 159 | char *mount_data, const char *devname); |
160 | extern int cifs_mount(struct cifs_sb_info *, struct smb_vol *); | 160 | extern int cifs_mount(struct cifs_sb_info *, struct smb_vol *); |
161 | extern int cifs_umount(struct super_block *, struct cifs_sb_info *); | 161 | extern void cifs_umount(struct cifs_sb_info *); |
162 | extern void cifs_dfs_release_automount_timer(void); | 162 | extern void cifs_dfs_release_automount_timer(void); |
163 | void cifs_proc_init(void); | 163 | void cifs_proc_init(void); |
164 | void cifs_proc_clean(void); | 164 | void cifs_proc_clean(void); |
diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c index 9f09adf51ed..b2702226634 100644 --- a/fs/cifs/connect.c +++ b/fs/cifs/connect.c | |||
@@ -3339,8 +3339,8 @@ CIFSTCon(unsigned int xid, struct cifs_ses *ses, | |||
3339 | return rc; | 3339 | return rc; |
3340 | } | 3340 | } |
3341 | 3341 | ||
3342 | int | 3342 | void |
3343 | cifs_umount(struct super_block *sb, struct cifs_sb_info *cifs_sb) | 3343 | cifs_umount(struct cifs_sb_info *cifs_sb) |
3344 | { | 3344 | { |
3345 | struct rb_root *root = &cifs_sb->tlink_tree; | 3345 | struct rb_root *root = &cifs_sb->tlink_tree; |
3346 | struct rb_node *node; | 3346 | struct rb_node *node; |
@@ -3362,7 +3362,6 @@ cifs_umount(struct super_block *sb, struct cifs_sb_info *cifs_sb) | |||
3362 | spin_unlock(&cifs_sb->tlink_tree_lock); | 3362 | spin_unlock(&cifs_sb->tlink_tree_lock); |
3363 | 3363 | ||
3364 | bdi_destroy(&cifs_sb->bdi); | 3364 | bdi_destroy(&cifs_sb->bdi); |
3365 | return 0; | ||
3366 | } | 3365 | } |
3367 | 3366 | ||
3368 | int cifs_negotiate_protocol(unsigned int xid, struct cifs_ses *ses) | 3367 | int cifs_negotiate_protocol(unsigned int xid, struct cifs_ses *ses) |