X-Git-Url: http://pilppa.org/gitweb/?a=blobdiff_plain;f=fs%2Fsmbfs%2Finode.c;h=5faba4f1c9abe7deb370d24b74412bad148468f7;hb=22c8ca78f20724676b6006232bf06cc3e9299539;hp=4af4cd729a5a8589706e536d3860175c69b90d2d;hpb=2fd8507d14ef7af3ae05316b3277044cf6daa381;p=linux-2.6-omap-h63xx.git

diff --git a/fs/smbfs/inode.c b/fs/smbfs/inode.c
index 4af4cd729a5..5faba4f1c9a 100644
--- a/fs/smbfs/inode.c
+++ b/fs/smbfs/inode.c
@@ -98,7 +98,7 @@ static int smb_remount(struct super_block *sb, int *flags, char *data)
 	return 0;
 }
 
-static struct super_operations smb_sops =
+static const struct super_operations smb_sops =
 {
 	.alloc_inode	= smb_alloc_inode,
 	.destroy_inode	= smb_destroy_inode,
@@ -482,12 +482,13 @@ smb_put_super(struct super_block *sb)
 	smb_close_socket(server);
 
 	if (server->conn_pid)
-		kill_proc(server->conn_pid, SIGTERM, 1);
+		kill_pid(server->conn_pid, SIGTERM, 1);
 
 	kfree(server->ops);
 	smb_unload_nls(server);
 	sb->s_fs_info = NULL;
 	smb_unlock_server(server);
+	put_pid(server->conn_pid);
 	kfree(server);
 }
 
@@ -530,7 +531,7 @@ static int smb_fill_super(struct super_block *sb, void *raw_data, int silent)
 	INIT_LIST_HEAD(&server->xmitq);
 	INIT_LIST_HEAD(&server->recvq);
 	server->conn_error = 0;
-	server->conn_pid = 0;
+	server->conn_pid = NULL;
 	server->state = CONN_INVALID; /* no connection yet */
 	server->generation = 0;