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

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

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

  Features:
   - NFSv4.2 client support for hole punching and preallocation.
   - Further RPC/RDMA client improvements.
   - Add more RPC transport debugging tracepoints.
   - Add RPC debugging tools in debugfs.

  Bugfixes:
   - Stable fix for layoutget error handling
   - Fix a change in COMMIT behaviour resulting from the recent io code
     updates"

* tag 'nfs-for-3.19-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs: (28 commits)
  sunrpc: add a debugfs rpc_xprt directory with an info file in it
  sunrpc: add debugfs file for displaying client rpc_task queue
  nfs: Add DEALLOCATE support
  nfs: Add ALLOCATE support
  NFS: Clean up nfs4_init_callback()
  NFS: SETCLIENTID XDR buffer sizes are incorrect
  SUNRPC: serialize iostats updates
  xprtrdma: Display async errors
  xprtrdma: Enable pad optimization
  xprtrdma: Re-write rpcrdma_flush_cqs()
  xprtrdma: Refactor tasklet scheduling
  xprtrdma: unmap all FMRs during transport disconnect
  xprtrdma: Cap req_cqinit
  xprtrdma: Return an errno from rpcrdma_register_external()
  nfs: define nfs_inc_fscache_stats and using it as possible
  nfs: replace nfs_add_stats with nfs_inc_stats when add one
  NFS: Deletion of unnecessary checks before the function call "nfs_put_client"
  sunrpc: eliminate RPC_TRACEPOINTS
  sunrpc: eliminate RPC_DEBUG
  lockd: eliminate LOCKD_DEBUG
  ...
parents 3a5dc1fa 388f0c77

fs/lockd/svclock.c

+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ static const struct rpc_call_ops nlmsvc_grant_ops; 
static LIST_HEAD(nlm_blocked);

static DEFINE_SPINLOCK(nlm_blocked_lock);



#ifdef LOCKD_DEBUG

#if IS_ENABLED(CONFIG_SUNRPC_DEBUG)

static const char *nlmdbg_cookie2a(const struct nlm_cookie *cookie)

{

	/*

fs/nfs/blocklayout/blocklayout.c

+1 −1
Original line number Diff line number Diff line
@@ -812,7 +812,7 @@ static u64 pnfs_num_cont_bytes(struct inode *inode, pgoff_t idx) 


	/* Optimize common case that writes from 0 to end of file */

	end = DIV_ROUND_UP(i_size_read(inode), PAGE_CACHE_SIZE);

	if (end != NFS_I(inode)->npages) {

	if (end != inode->i_mapping->nrpages) {

		rcu_read_lock();

		end = page_cache_next_hole(mapping, idx + 1, ULONG_MAX);

		rcu_read_unlock();

fs/nfs/callback_proc.c

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ __be32 nfs4_callback_getattr(struct cb_getattrargs *args, 
		goto out_iput;

	res->size = i_size_read(inode);

	res->change_attr = delegation->change_attr;

	if (nfsi->npages != 0)

	if (nfsi->nrequests != 0)

		res->change_attr++;

	res->ctime = inode->i_ctime;

	res->mtime = inode->i_mtime;

fs/nfs/filelayout/filelayoutdev.c

+1 −2
Original line number Diff line number Diff line
@@ -204,7 +204,6 @@ destroy_ds(struct nfs4_pnfs_ds *ds) 
	ifdebug(FACILITY)

		print_ds(ds);



	if (ds->ds_clp)

	nfs_put_client(ds->ds_clp);



	while (!list_empty(&ds->ds_addrs)) {

fs/nfs/fscache.c

+12 −12
Original line number Diff line number Diff line
@@ -269,8 +269,8 @@ int nfs_fscache_release_page(struct page *page, gfp_t gfp) 
		if (!fscache_maybe_release_page(cookie, page, gfp))

			return 0;



		nfs_add_fscache_stats(page->mapping->host,

				      NFSIOS_FSCACHE_PAGES_UNCACHED, 1);

		nfs_inc_fscache_stats(page->mapping->host,

				      NFSIOS_FSCACHE_PAGES_UNCACHED);

	}



	return 1;
@@ -293,8 +293,8 @@ void __nfs_fscache_invalidate_page(struct page *page, struct inode *inode) 


	BUG_ON(!PageLocked(page));

	fscache_uncache_page(cookie, page);

	nfs_add_fscache_stats(page->mapping->host,

			      NFSIOS_FSCACHE_PAGES_UNCACHED, 1);

	nfs_inc_fscache_stats(page->mapping->host,

			      NFSIOS_FSCACHE_PAGES_UNCACHED);

}



/*
@@ -343,19 +343,19 @@ int __nfs_readpage_from_fscache(struct nfs_open_context *ctx, 
	case 0: /* read BIO submitted (page in fscache) */

		dfprintk(FSCACHE,

			 "NFS:    readpage_from_fscache: BIO submitted\n");

		nfs_add_fscache_stats(inode, NFSIOS_FSCACHE_PAGES_READ_OK, 1);

		nfs_inc_fscache_stats(inode, NFSIOS_FSCACHE_PAGES_READ_OK);

		return ret;



	case -ENOBUFS: /* inode not in cache */

	case -ENODATA: /* page not in cache */

		nfs_add_fscache_stats(inode, NFSIOS_FSCACHE_PAGES_READ_FAIL, 1);

		nfs_inc_fscache_stats(inode, NFSIOS_FSCACHE_PAGES_READ_FAIL);

		dfprintk(FSCACHE,

			 "NFS:    readpage_from_fscache %d\n", ret);

		return 1;



	default:

		dfprintk(FSCACHE, "NFS:    readpage_from_fscache %d\n", ret);

		nfs_add_fscache_stats(inode, NFSIOS_FSCACHE_PAGES_READ_FAIL, 1);

		nfs_inc_fscache_stats(inode, NFSIOS_FSCACHE_PAGES_READ_FAIL);

	}

	return ret;

}
@@ -429,11 +429,11 @@ void __nfs_readpage_to_fscache(struct inode *inode, struct page *page, int sync) 


	if (ret != 0) {

		fscache_uncache_page(nfs_i_fscache(inode), page);

		nfs_add_fscache_stats(inode,

				      NFSIOS_FSCACHE_PAGES_WRITTEN_FAIL, 1);

		nfs_add_fscache_stats(inode, NFSIOS_FSCACHE_PAGES_UNCACHED, 1);

		nfs_inc_fscache_stats(inode,

				      NFSIOS_FSCACHE_PAGES_WRITTEN_FAIL);

		nfs_inc_fscache_stats(inode, NFSIOS_FSCACHE_PAGES_UNCACHED);

	} else {

		nfs_add_fscache_stats(inode,

				      NFSIOS_FSCACHE_PAGES_WRITTEN_OK, 1);

		nfs_inc_fscache_stats(inode,

				      NFSIOS_FSCACHE_PAGES_WRITTEN_OK);

	}

}