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

Commit 8e7757d8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'nfs-for-4.14-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs 

Pull NFS client updates from Trond Myklebust:
 "Hightlights include:

  Stable bugfixes:
   - Fix mirror allocation in the writeback code to avoid a use after
     free
   - Fix the O_DSYNC writes to use the correct byte range
   - Fix 2 use after free issues in the I/O code

  Features:
   - Writeback fixes to split up the inode->i_lock in order to reduce
     contention
   - RPC client receive fixes to reduce the amount of time the
     xprt->transport_lock is held when receiving data from a socket into
     am XDR buffer.
   - Ditto fixes to reduce contention between call side users of the
     rdma rb_lock, and its use in rpcrdma_reply_handler.
   - Re-arrange rdma stats to reduce false cacheline sharing.
   - Various rdma cleanups and optimisations.
   - Refactor the NFSv4.1 exchange id code and clean up the code.
   - Const-ify all instances of struct rpc_xprt_ops

  Bugfixes:
   - Fix the NFSv2 'sec=' mount option.
   - NFSv4.1: don't use machine credentials for CLOSE when using
     'sec=sys'
   - Fix the NFSv3 GRANT callback when the port changes on the server.
   - Fix livelock issues with COMMIT
   - NFSv4: Use correct inode in _nfs4_opendata_to_nfs4_state() when
     doing and NFSv4.1 open by filehandle"

* tag 'nfs-for-4.14-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs: (69 commits)
  NFS: Count the bytes of skipped subrequests in nfs_lock_and_join_requests()
  NFS: Don't hold the group lock when calling nfs_release_request()
  NFS: Remove pnfs_generic_transfer_commit_list()
  NFS: nfs_lock_and_join_requests and nfs_scan_commit_list can deadlock
  NFS: Fix 2 use after free issues in the I/O code
  NFS: Sync the correct byte range during synchronous writes
  lockd: Delete an error message for a failed memory allocation in reclaimer()
  NFS: remove jiffies field from access cache
  NFS: flush data when locking a file to ensure cache coherence for mmap.
  SUNRPC: remove some dead code.
  NFS: don't expect errors from mempool_alloc().
  xprtrdma: Use xprt_pin_rqst in rpcrdma_reply_handler
  xprtrdma: Re-arrange struct rx_stats
  NFS: Fix NFSv2 security settings
  NFSv4.1: don't use machine credentials for CLOSE when using 'sec=sys'
  SUNRPC: ECONNREFUSED should cause a rebind.
  NFS: Remove unused parameter gfp_flags from nfs_pageio_init()
  NFSv4: Fix up mirror allocation
  SUNRPC: Add a separate spinlock to protect the RPC request receive list
  SUNRPC: Cleanup xs_tcp_read_common()
  ...
parents dd198ce7 1bd5d6d0

fs/lockd/clntlock.c

+1 −5
Original line number Diff line number Diff line
@@ -235,12 +235,8 @@ reclaimer(void *ptr) 
	struct net *net = host->net;



	req = kmalloc(sizeof(*req), GFP_KERNEL);

	if (!req) {

		printk(KERN_ERR "lockd: reclaimer unable to alloc memory."

				" Locks for %s won't be reclaimed!\n",

				host->h_name);

	if (!req)

		return 0;

	}



	allow_signal(SIGKILL);

fs/nfs/callback_proc.c

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ __be32 nfs4_callback_getattr(void *argp, void *resp, 
		goto out_iput;

	res->size = i_size_read(inode);

	res->change_attr = delegation->change_attr;

	if (nfsi->nrequests != 0)

	if (nfs_have_writebacks(inode))

		res->change_attr++;

	res->ctime = inode->i_ctime;

	res->mtime = inode->i_mtime;

fs/nfs/delegation.c

+1 −1
Original line number Diff line number Diff line
@@ -1089,7 +1089,7 @@ bool nfs4_delegation_flush_on_close(const struct inode *inode) 
	delegation = rcu_dereference(nfsi->delegation);

	if (delegation == NULL || !(delegation->type & FMODE_WRITE))

		goto out;

	if (nfsi->nrequests < delegation->pagemod_limit)

	if (atomic_long_read(&nfsi->nrequests) < delegation->pagemod_limit)

		ret = false;

out:

	rcu_read_unlock();

fs/nfs/dir.c

+0 −4
Original line number Diff line number Diff line
@@ -2260,7 +2260,6 @@ static int nfs_access_get_cached(struct inode *inode, struct rpc_cred *cred, str 
		spin_lock(&inode->i_lock);

		retry = false;

	}

	res->jiffies = cache->jiffies;

	res->cred = cache->cred;

	res->mask = cache->mask;

	list_move_tail(&cache->lru, &nfsi->access_cache_entry_lru);
@@ -2296,7 +2295,6 @@ static int nfs_access_get_cached_rcu(struct inode *inode, struct rpc_cred *cred, 
		goto out;

	if (nfs_check_cache_invalid(inode, NFS_INO_INVALID_ACCESS))

		goto out;

	res->jiffies = cache->jiffies;

	res->cred = cache->cred;

	res->mask = cache->mask;

	err = 0;
@@ -2344,7 +2342,6 @@ void nfs_access_add_cache(struct inode *inode, struct nfs_access_entry *set) 
	if (cache == NULL)

		return;

	RB_CLEAR_NODE(&cache->rb_node);

	cache->jiffies = set->jiffies;

	cache->cred = get_rpccred(set->cred);

	cache->mask = set->mask;
@@ -2432,7 +2429,6 @@ static int nfs_do_access(struct inode *inode, struct rpc_cred *cred, int mask) 
	cache.mask = NFS_MAY_LOOKUP | NFS_MAY_EXECUTE

		     | NFS_MAY_WRITE | NFS_MAY_READ;

	cache.cred = cred;

	cache.jiffies = jiffies;

	status = NFS_PROTO(inode)->access(inode, &cache);

	if (status != 0) {

		if (status == -ESTALE) {

fs/nfs/direct.c

+2 −2
Original line number Diff line number Diff line
@@ -616,13 +616,13 @@ nfs_direct_write_scan_commit_list(struct inode *inode, 
				  struct list_head *list,

				  struct nfs_commit_info *cinfo)

{

	spin_lock(&cinfo->inode->i_lock);

	mutex_lock(&NFS_I(cinfo->inode)->commit_mutex);

#ifdef CONFIG_NFS_V4_1

	if (cinfo->ds != NULL && cinfo->ds->nwritten != 0)

		NFS_SERVER(inode)->pnfs_curr_ld->recover_commit_reqs(list, cinfo);

#endif

	nfs_scan_commit_list(&cinfo->mds->list, list, cinfo, 0);

	spin_unlock(&cinfo->inode->i_lock);

	mutex_unlock(&NFS_I(cinfo->inode)->commit_mutex);

}



static void nfs_direct_write_reschedule(struct nfs_direct_req *dreq)