Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b8ea0d06 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 022e5d09 b72888cb

fs/lockd/clntlock.c

+9 −4
Original line number Diff line number Diff line
@@ -64,12 +64,17 @@ struct nlm_host *nlmclnt_init(const struct nlmclnt_initdata *nlm_init) 
				   nlm_init->protocol, nlm_version,

				   nlm_init->hostname, nlm_init->noresvport,

				   nlm_init->net);

	if (host == NULL) {

		lockd_down(nlm_init->net);

		return ERR_PTR(-ENOLCK);

	}

	if (host == NULL)

		goto out_nohost;

	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
Original line number Diff line number Diff line
@@ -125,14 +125,15 @@ static void nlmclnt_setlockargs(struct nlm_rqst *req, struct file_lock *fl) 
{

	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
Original line number Diff line number Diff line
@@ -463,7 +463,6 @@ nfs_fhget(struct super_block *sb, struct nfs_fh *fh, struct nfs_fattr *fattr, st 
		unlock_new_inode(inode);

	} else

		nfs_refresh_inode(inode, fattr);

		nfs_setsecurity(inode, fattr, label);

	dprintk("NFS: nfs_fhget(%s/%Ld fh_crc=0x%08x ct=%d)\n",

		inode->i_sb->s_id,

		(long long)NFS_FILEID(inode),
@@ -963,9 +962,15 @@ EXPORT_SYMBOL_GPL(nfs_revalidate_inode); 
static int nfs_invalidate_mapping(struct inode *inode, struct address_space *mapping)

{

	struct nfs_inode *nfsi = NFS_I(inode);

	int ret;



	if (mapping->nrpages != 0) {

		int ret = invalidate_inode_pages2(mapping);

		if (S_ISREG(inode->i_mode)) {

			ret = nfs_sync_mapping(mapping);

			if (ret < 0)

				return ret;

		}

		ret = invalidate_inode_pages2(mapping);

		if (ret < 0)

			return ret;

	}

fs/nfs/nfs4proc.c

+3 −5
Original line number Diff line number Diff line
@@ -3071,15 +3071,13 @@ struct rpc_clnt * 
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) {

		rpc_shutdown_client(client);

	if (status < 0)

		return ERR_PTR(status);

	}

	return client;

	return (client == NFS_CLIENT(dir)) ? rpc_clone_client(client) : client;

}



static int _nfs4_proc_access(struct inode *inode, struct nfs_access_entry *entry)

fs/nfs/super.c

+4 −0
Original line number Diff line number Diff line
@@ -2478,6 +2478,10 @@ struct dentry *nfs_fs_mount_common(struct nfs_server *server, 
	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)) {