Skip to content

Commit

Permalink
sanitize cifs_umount() prototype
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Al Viro committed Jun 24, 2011
1 parent 2ced6f6 commit 2a9b995
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 8 deletions.
6 changes: 2 additions & 4 deletions fs/cifs/cifsfs.c
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ cifs_read_super(struct super_block *sb, struct smb_vol *volume_info,
if (inode)
iput(inode);

cifs_umount(sb, cifs_sb);
cifs_umount(cifs_sb);
return rc;
}

Expand All @@ -189,9 +189,7 @@ cifs_put_super(struct super_block *sb)
return;
}

rc = cifs_umount(sb, cifs_sb);
if (rc)
cERROR(1, "cifs_umount failed with return code %d", rc);
cifs_umount(cifs_sb);
}

static void cifs_kill_sb(struct super_block *sb)
Expand Down
2 changes: 1 addition & 1 deletion fs/cifs/cifsproto.h
Original file line number Diff line number Diff line change
Expand Up @@ -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,
char *mount_data, const char *devname);
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);
void cifs_proc_init(void);
void cifs_proc_clean(void);
Expand Down
5 changes: 2 additions & 3 deletions fs/cifs/connect.c
Original file line number Diff line number Diff line change
Expand Up @@ -3339,8 +3339,8 @@ CIFSTCon(unsigned int xid, struct cifs_ses *ses,
return rc;
}

int
cifs_umount(struct super_block *sb, struct cifs_sb_info *cifs_sb)
void
cifs_umount(struct cifs_sb_info *cifs_sb)
{
struct rb_root *root = &cifs_sb->tlink_tree;
struct rb_node *node;
Expand All @@ -3362,7 +3362,6 @@ cifs_umount(struct super_block *sb, struct cifs_sb_info *cifs_sb)
spin_unlock(&cifs_sb->tlink_tree_lock);

bdi_destroy(&cifs_sb->bdi);
return 0;
}

int cifs_negotiate_protocol(unsigned int xid, struct cifs_ses *ses)
Expand Down

0 comments on commit 2a9b995

Please sign in to comment.