From: Al Viro <viro@zeniv.linux.org.uk>
Date: Fri, 17 Jun 2011 13:27:16 +0000 (-0400)
Subject: sanitize cifs_umount() prototype
X-Git-Tag: v3.0-rc5~31^2~7
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=2a9b99516c662d1713d58648e4a4c9aef72051bc;p=linux.git

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>
---

diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c
index 61c7aa870f1c..2af14d4577a7 100644
--- a/fs/cifs/cifsfs.c
+++ b/fs/cifs/cifsfs.c
@@ -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;
 }
 
@@ -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)
diff --git a/fs/cifs/cifsproto.h b/fs/cifs/cifsproto.h
index 5814fe543f95..257f312ede42 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);
 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);
diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c
index 9f09adf51edc..b2702226634e 100644
--- a/fs/cifs/connect.c
+++ b/fs/cifs/connect.c
@@ -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;
@@ -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)