evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sanitize cifs_umount() prototype

Browse source 
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>
This commit is contained in:
Al Viro 2011-06-17 09:27:16 -04:00
parent 2ced6f6935
commit 2a9b99516c
3 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
fs/cifs/cifsfs.c
View file

@ -172,7 +172,7 @@ out_no_root:
if (inode) if (inode)
iput(inode); iput(inode);
cifs_umount(sb, cifs_sb); cifs_umount(cifs_sb);
return rc; return rc;
} }
@ -189,9 +189,7 @@ cifs_put_super(struct super_block *sb)
return; return;
} }
rc = cifs_umount(sb, cifs_sb); cifs_umount(cifs_sb);
if (rc)
cERROR(1, "cifs_umount failed with return code %d", rc);
} }
static void cifs_kill_sb(struct super_block *sb) static void cifs_kill_sb(struct super_block *sb)

2
fs/cifs/cifsproto.h
View file

@ -158,7 +158,7 @@ extern void cifs_cleanup_volume_info(struct smb_vol **pvolume_info);
extern int cifs_setup_volume_info(struct smb_vol **pvolume_info, extern int cifs_setup_volume_info(struct smb_vol **pvolume_info,
char *mount_data, const char *devname); char *mount_data, const char *devname);
extern int cifs_mount(struct cifs_sb_info *, struct smb_vol *); extern int cifs_mount(struct cifs_sb_info *, struct smb_vol *);
extern int cifs_umount(struct super_block *, struct cifs_sb_info *); extern void cifs_umount(struct cifs_sb_info *);
extern void cifs_dfs_release_automount_timer(void); extern void cifs_dfs_release_automount_timer(void);
void cifs_proc_init(void); void cifs_proc_init(void);
void cifs_proc_clean(void); void cifs_proc_clean(void);

5
fs/cifs/connect.c
View file

@ -3339,8 +3339,8 @@ CIFSTCon(unsigned int xid, struct cifs_ses *ses,
return rc; return rc;
} }
int void
cifs_umount(struct super_block *sb, struct cifs_sb_info *cifs_sb) cifs_umount(struct cifs_sb_info *cifs_sb)
{ {
struct rb_root *root = &cifs_sb->tlink_tree; struct rb_root *root = &cifs_sb->tlink_tree;
struct rb_node *node; struct rb_node *node;
@ -3362,7 +3362,6 @@ cifs_umount(struct super_block *sb, struct cifs_sb_info *cifs_sb)
spin_unlock(&cifs_sb->tlink_tree_lock); spin_unlock(&cifs_sb->tlink_tree_lock);
bdi_destroy(&cifs_sb->bdi); bdi_destroy(&cifs_sb->bdi);
return 0;
} }
int cifs_negotiate_protocol(unsigned int xid, struct cifs_ses *ses) int cifs_negotiate_protocol(unsigned int xid, struct cifs_ses *ses)