patch-2.1.75 linux/fs/nfs/inode.c

Next file: linux/fs/nfs/nfs2xdr.c
Previous file: linux/fs/nfs/dir.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.74/linux/fs/nfs/inode.c linux/fs/nfs/inode.c
@@ -260,12 +260,8 @@
 	server->client    = clnt;
 
 	/* Fire up rpciod if not yet running */
-#ifdef RPCIOD_RESULT
-	if (rpciod_up())
+	if (rpciod_up() != 0)
 		goto out_no_iod;
-#else
-	rpciod_up();
-#endif
 
 	/*
 	 * Keep the super block locked while we try to get 
@@ -290,13 +286,11 @@
 	printk("nfs_read_super: get root inode failed\n");
 	iput(root_inode);
 	rpciod_down();
-#ifdef RPCIOD_RESULT
 	goto out_shutdown;
 
 out_no_iod:
-	printk("nfs_read_super: couldn't start rpciod!\n");
+	printk("NFS: couldn't start rpciod!\n");
 out_shutdown:
-#endif
 	rpc_shutdown_client(server->client);
 	goto out_unlock;
 

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov