Merge tag 'nfs-for-3.11-4' of git://git.linux-nfs.org/projects/trondmy/linux-nfs

Pull NFS client bugfixes from Trond Myklebust: - Stable patch for lockd to fix Oopses due to inappropriate calls to utsname()->nodename - Stable patches for sunrpc to fix Oopses on shutdown when using AF_LOCAL sockets with rpcbind - Fix memory leak and error checking issues in nfs4_proc_lookup_mountpoint - Fix a regression with the sync mount option failing to work for nfs4 mounts - Fix a writeback performance issue when doing cache invalidation - Remove an incorrect call to nfs_setsecurity in nfs_fhget * tag 'nfs-for-3.11-4' of git://git.linux-nfs.org/projects/trondmy/linux-nfs: NFSv4: Fix up nfs4_proc_lookup_mountpoint NFS: Remove unnecessary call to nfs_setsecurity in nfs_fhget() NFSv4: Fix the sync mount option for nfs4 mounts NFS: Fix writeback performance issue on cache invalidation SUNRPC: If the rpcbind channel is disconnected, fail the call to unregister SUNRPC: Don't auto-disconnect from the local rpcbind socket LOCKD: Don't call utsname()->nodename from nlmclnt_setlockargs

Linus Torvalds committed 13 years ago

Commit b8ea0d02 parents 022e5d0 b72888c9 files · +68 −27Browse files

Unified · Split

9 files

fs/lockd/clntlock.c +9 −4
fs/lockd/clntproc.c +3 −2
fs/nfs/inode.c +8 −3
fs/nfs/nfs4proc.c +3 −5
fs/nfs/super.c +4 −0
include/linux/sunrpc/sched.h +1 −0
net/sunrpc/clnt.c +4 −0
net/sunrpc/netns.h +1 −0
net/sunrpc/rpcb_clnt.c +35 −13

fs/lockd/clntlock.c+9−4

 				   nlm_init->protocol, nlm_version,
 				   nlm_init->hostname, nlm_init->noresvport,
 				   nlm_init->net);
-	if (host == NULL) {
+	if (host == NULL)
-		lockd_down(nlm_init->net);
+		goto out_nohost;
-		return ERR_PTR(-ENOLCK);
+	if (host->h_rpcclnt == NULL && nlm_bind_host(host) == NULL)
-	}
+		goto out_nobind;
 	return host;
+out_nobind:
+	nlmclnt_release_host(host);
+out_nohost:
+	lockd_down(nlm_init->net);
+	return ERR_PTR(-ENOLCK);
 }
 EXPORT_SYMBOL_GPL(nlmclnt_init);

fs/lockd/clntproc.c+3−2

 {
 	struct nlm_args	*argp = &req->a_args;
 	struct nlm_lock	*lock = &argp->lock;
+	char *nodename = req->a_host->h_rpcclnt->cl_nodename;
 	nlmclnt_next_cookie(&argp->cookie);
 	memcpy(&lock->fh, NFS_FH(file_inode(fl->fl_file)), sizeof(struct nfs_fh));
-	lock->caller  = utsname()->nodename;
+	lock->caller  = nodename;
 	lock->oh.data = req->a_owner;
 	lock->oh.len  = snprintf(req->a_owner, sizeof(req->a_owner), "%u@%s",
 				(unsigned int)fl->fl_u.nfs_fl.owner->pid,
-				utsname()->nodename);
+				nodename);
 	lock->svid = fl->fl_u.nfs_fl.owner->pid;
 	lock->fl.fl_start = fl->fl_start;
 	lock->fl.fl_end = fl->fl_end;

fs/nfs/inode.c+8−3

@@ -463,7 +463,6 @@ nfs_fhget(struct super_block sb, struct nfs_fh fh, struct nfs_fattr *fattr, st · 462 unmodified lines
463	unlock_new_inode(inode);	463	unlock_new_inode(inode);
464	} else	464	} else
465	nfs_refresh_inode(inode, fattr);	465	nfs_refresh_inode(inode, fattr);
466	nfs_setsecurity(inode, fattr, label);
467	dprintk("NFS: nfs_fhget(%s/%Ld fh_crc=0x%08x ct=%d)\n",	466	dprintk("NFS: nfs_fhget(%s/%Ld fh_crc=0x%08x ct=%d)\n",
468	inode->i_sb->s_id,	467	inode->i_sb->s_id,
469	(long long)NFS_FILEID(inode),	468	(long long)NFS_FILEID(inode),
@@ -963,9 +962,15 @@ EXPORT_SYMBOL_GPL(nfs_revalidate_inode); · 493 unmodified lines
963	static int nfs_invalidate_mapping(struct inode inode, struct address_space mapping)	962	static int nfs_invalidate_mapping(struct inode inode, struct address_space mapping)
964	{	963	{
965	struct nfs_inode *nfsi = NFS_I(inode);	964	struct nfs_inode *nfsi = NFS_I(inode);
966		965	int ret;
		966
967	if (mapping->nrpages != 0) {	967	if (mapping->nrpages != 0) {
968	int ret = invalidate_inode_pages2(mapping);	968	if (S_ISREG(inode->i_mode)) {
		969	ret = nfs_sync_mapping(mapping);
		970	if (ret < 0)
		971	return ret;
		972	}
		973	ret = invalidate_inode_pages2(mapping);
969	if (ret < 0)	974	if (ret < 0)
970	return ret;	975	return ret;
971	}	976	}

fs/nfs/nfs4proc.c+3−5

 nfs4_proc_lookup_mountpoint(struct inode *dir, struct qstr *name,
 			    struct nfs_fh *fhandle, struct nfs_fattr *fattr)
 {
+	struct rpc_clnt *client = NFS_CLIENT(dir);
 	int status;
-	struct rpc_clnt *client = rpc_clone_client(NFS_CLIENT(dir));
 	status = nfs4_proc_lookup_common(&client, dir, name, fhandle, fattr, NULL);
-	if (status < 0) {
+	if (status < 0)
-		rpc_shutdown_client(client);
 		return ERR_PTR(status);
-	}
+	return (client == NFS_CLIENT(dir)) ? rpc_clone_client(client) : client;
-	return client;
 }
 static int _nfs4_proc_access(struct inode *inode, struct nfs_access_entry *entry)

fs/nfs/super.c+4−0

 	if (server->flags & NFS_MOUNT_NOAC)
 		sb_mntdata.mntflags |= MS_SYNCHRONOUS;
+	if (mount_info->cloned != NULL && mount_info->cloned->sb != NULL)
+		if (mount_info->cloned->sb->s_flags & MS_SYNCHRONOUS)
+			sb_mntdata.mntflags |= MS_SYNCHRONOUS;
 	/* Get a superblock - note that we may end up sharing one that already exists */
 	s = sget(nfs_mod->nfs_fs, compare_super, nfs_set_super, flags, &sb_mntdata);
 	if (IS_ERR(s)) {

include/linux/sunrpc/sched.h+1−0

@@ -121,6 +121,7 @@ struct rpc_task_setup { · 120 unmodified lines
121	#define RPC_TASK_SOFTCONN 0x0400 /* Fail if can't connect */	121	#define RPC_TASK_SOFTCONN 0x0400 /* Fail if can't connect */
122	#define RPC_TASK_SENT 0x0800 /* message was sent */	122	#define RPC_TASK_SENT 0x0800 /* message was sent */
123	#define RPC_TASK_TIMEOUT 0x1000 /* fail with ETIMEDOUT on timeout */	123	#define RPC_TASK_TIMEOUT 0x1000 /* fail with ETIMEDOUT on timeout */
		124	#define RPC_TASK_NOCONNECT 0x2000 /* return ENOTCONN if not connected */
124		125
125	#define RPC_IS_ASYNC(t) ((t)->tk_flags & RPC_TASK_ASYNC)	126	#define RPC_IS_ASYNC(t) ((t)->tk_flags & RPC_TASK_ASYNC)
126	#define RPC_IS_SWAPPER(t) ((t)->tk_flags & RPC_TASK_SWAPPER)	127	#define RPC_IS_SWAPPER(t) ((t)->tk_flags & RPC_TASK_SWAPPER)

net/sunrpc/clnt.c+4−0

 		task->tk_action = call_connect_status;
 		if (task->tk_status < 0)
 			return;
+		if (task->tk_flags & RPC_TASK_NOCONNECT) {
+			rpc_exit(task, -ENOTCONN);
+			return;
+		}
 		xprt_connect(task);
 	}
 }

net/sunrpc/netns.h+1−0

@@ -23,6 +23,7 @@ struct sunrpc_net { · 22 unmodified lines
23	struct rpc_clnt *rpcb_local_clnt4;	23	struct rpc_clnt *rpcb_local_clnt4;
24	spinlock_t rpcb_clnt_lock;	24	spinlock_t rpcb_clnt_lock;
25	unsigned int rpcb_users;	25	unsigned int rpcb_users;
		26	unsigned int rpcb_is_af_local : 1;
26		27
27	struct mutex gssp_lock;	28	struct mutex gssp_lock;
28	wait_queue_head_t gssp_wq;	29	wait_queue_head_t gssp_wq;

net/sunrpc/rpcb_clnt.c+35−13

 }
 static void rpcb_set_local(struct net *net, struct rpc_clnt *clnt,
-			struct rpc_clnt *clnt4)
+			struct rpc_clnt *clnt4,
+			bool is_af_local)
 {
 	struct sunrpc_net *sn = net_generic(net, sunrpc_net_id);
 	/* Protected by rpcb_create_local_mutex */
 	sn->rpcb_local_clnt = clnt;
 	sn->rpcb_local_clnt4 = clnt4;
+	sn->rpcb_is_af_local = is_af_local ? 1 : 0;
 	smp_wmb();
 	sn->rpcb_users = 1;
 	dprintk("RPC:       created new rpcb local clients (rpcb_local_clnt: "
 		.program	= &rpcb_program,
 		.version	= RPCBVERS_2,
 		.authflavor	= RPC_AUTH_NULL,
+		/*
+		 * We turn off the idle timeout to prevent the kernel
+		 * from automatically disconnecting the socket.
+		 * Otherwise, we'd have to cache the mount namespace
+		 * of the caller and somehow pass that to the socket
+		 * reconnect code.
+		 */
+		.flags		= RPC_CLNT_CREATE_NO_IDLE_TIMEOUT,
 	};
 	struct rpc_clnt *clnt, *clnt4;
 	int result = 0;
 		clnt4 = NULL;
 	}
-	rpcb_set_local(net, clnt, clnt4);
+	rpcb_set_local(net, clnt, clnt4, true);
 out:
 	return result;
 		clnt4 = NULL;
 	}
-	rpcb_set_local(net, clnt, clnt4);
+	rpcb_set_local(net, clnt, clnt4, false);
 out:
 	return result;
 	return rpc_create(&args);
 }
-static int rpcb_register_call(struct rpc_clnt *clnt, struct rpc_message *msg)
+static int rpcb_register_call(struct sunrpc_net *sn, struct rpc_clnt *clnt, struct rpc_message *msg, bool is_set)
 {
-	int result, error = 0;
+	int flags = RPC_TASK_NOCONNECT;
+	int error, result = 0;
+	if (is_set || !sn->rpcb_is_af_local)
+		flags = RPC_TASK_SOFTCONN;
 	msg->rpc_resp = &result;
-	error = rpc_call_sync(clnt, msg, RPC_TASK_SOFTCONN);
+	error = rpc_call_sync(clnt, msg, flags);
 	if (error < 0) {
 		dprintk("RPC:       failed to contact local rpcbind "
 				"server (errno %d).\n", -error);
 		.rpc_argp	= &map,
 	};
 	struct sunrpc_net *sn = net_generic(net, sunrpc_net_id);
+	bool is_set = false;
 	dprintk("RPC:       %sregistering (%u, %u, %d, %u) with local "
 			"rpcbind\n", (port ? "" : "un"),
 			prog, vers, prot, port);
 	msg.rpc_proc = &rpcb_procedures2[RPCBPROC_UNSET];
-	if (port)
+	if (port != 0) {
 		msg.rpc_proc = &rpcb_procedures2[RPCBPROC_SET];
+		is_set = true;
+	}
-	return rpcb_register_call(sn->rpcb_local_clnt, &msg);
+	return rpcb_register_call(sn, sn->rpcb_local_clnt, &msg, is_set);
 }
 /*
 	const struct sockaddr_in *sin = (const struct sockaddr_in *)sap;
 	struct rpcbind_args *map = msg->rpc_argp;
 	unsigned short port = ntohs(sin->sin_port);
+	bool is_set = false;
 	int result;
 	map->r_addr = rpc_sockaddr2uaddr(sap, GFP_KERNEL);
 			map->r_addr, map->r_netid);
 	msg->rpc_proc = &rpcb_procedures4[RPCBPROC_UNSET];
-	if (port)
+	if (port != 0) {
 		msg->rpc_proc = &rpcb_procedures4[RPCBPROC_SET];
+		is_set = true;
+	}
-	result = rpcb_register_call(sn->rpcb_local_clnt4, msg);
+	result = rpcb_register_call(sn, sn->rpcb_local_clnt4, msg, is_set);
 	kfree(map->r_addr);
 	return result;
 }
 	const struct sockaddr_in6 *sin6 = (const struct sockaddr_in6 *)sap;
 	struct rpcbind_args *map = msg->rpc_argp;
 	unsigned short port = ntohs(sin6->sin6_port);
+	bool is_set = false;
 	int result;
 	map->r_addr = rpc_sockaddr2uaddr(sap, GFP_KERNEL);
 			map->r_addr, map->r_netid);
 	msg->rpc_proc = &rpcb_procedures4[RPCBPROC_UNSET];
-	if (port)
+	if (port != 0) {
 		msg->rpc_proc = &rpcb_procedures4[RPCBPROC_SET];
+		is_set = true;
+	}
-	result = rpcb_register_call(sn->rpcb_local_clnt4, msg);
+	result = rpcb_register_call(sn, sn->rpcb_local_clnt4, msg, is_set);
 	kfree(map->r_addr);
 	return result;
 }
 	map->r_addr = "";
 	msg->rpc_proc = &rpcb_procedures4[RPCBPROC_UNSET];
-	return rpcb_register_call(sn->rpcb_local_clnt4, msg);
+	return rpcb_register_call(sn, sn->rpcb_local_clnt4, msg, false);
 }
 /**

Merge tag 'nfs-for-3.11-4' of git://git.linux-nfs.org/projects/trondmy/linux-nfs

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code