Commit 59953fba authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull NFS client updates from Trond Myklebust:
 "Another set of mainly bugfixes and a couple of cleanups.  No new
  functionality in this round.

  Highlights include:

  Stable patches:
   - Fix a regression in /proc/self/mountstats
   - Fix the pNFS flexfiles O_DIRECT support
   - Fix high load average due to callback thread sleeping

  Bugfixes:
   - Various patches to fix the pNFS layoutcommit support
   - Do not cache pNFS deviceids unless server notifications are enabled
   - Fix a SUNRPC transport reconnection regression
   - make debugfs file creation failure non-fatal in SUNRPC
   - Another fix for circular directory warnings on NFSv4 "junctioned"
     mountpoints
   - Fix locking around NFSv4.2 fallocate() support
   - Truncating NFSv4 file opens should also sync O_DIRECT writes
   - Prevent infinite loop in rpcrdma_ep_create()

  Features:
   - Various improvements to the RDMA transport code's handling of
     memory registration
   - Various code cleanups"

* tag 'nfs-for-4.1-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs: (55 commits)
  fs/nfs: fix new compiler warning about boolean in switch
  nfs: Remove unneeded casts in nfs
  NFS: Don't attempt to decode missing directory entries
  Revert "nfs: replace nfs_add_stats with nfs_inc_stats when add one"
  NFS: Rename idmap.c to nfs4idmap.c
  NFS: Move nfs_idmap.h into fs/nfs/
  NFS: Remove CONFIG_NFS_V4 checks from nfs_idmap.h
  NFS: Add a stub for GETDEVICELIST
  nfs: remove WARN_ON_ONCE from nfs_direct_good_bytes
  nfs: fix DIO good bytes calculation
  nfs: Fetch MOUNTED_ON_FILEID when updating an inode
  sunrpc: make debugfs file creation failure non-fatal
  nfs: fix high load average due to callback thread sleeping
  NFS: Reduce time spent holding the i_mutex during fallocate()
  NFS: Don't zap caches on fallocate()
  xprtrdma: Make rpcrdma_{un}map_one() into inline functions
  xprtrdma: Handle non-SEND completions via a callout
  xprtrdma: Add "open" memreg op
  xprtrdma: Add "destroy MRs" memreg op
  xprtrdma: Add "reset MRs" memreg op
  ...
parents 9ec3a646 f139b6c6

fs/nfs/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ nfsv3-$(CONFIG_NFS_V3_ACL) += nfs3acl.o 
obj-$(CONFIG_NFS_V4) += nfsv4.o

CFLAGS_nfs4trace.o += -I$(src)

nfsv4-y := nfs4proc.o nfs4xdr.o nfs4state.o nfs4renewd.o nfs4super.o nfs4file.o \

	  delegation.o idmap.o callback.o callback_xdr.o callback_proc.o \

	  delegation.o nfs4idmap.o callback.o callback_xdr.o callback_proc.o \

	  nfs4namespace.o nfs4getroot.o nfs4client.o nfs4session.o \

	  dns_resolve.o nfs4trace.o

nfsv4-$(CONFIG_NFS_USE_LEGACY_DNS) += cache_lib.o

fs/nfs/blocklayout/blocklayout.c

+1 −0
Original line number Diff line number Diff line
@@ -890,6 +890,7 @@ static struct pnfs_layoutdriver_type blocklayout_type = { 
	.free_deviceid_node		= bl_free_deviceid_node,

	.pg_read_ops			= &bl_pg_read_ops,

	.pg_write_ops			= &bl_pg_write_ops,

	.sync				= pnfs_generic_sync,

};



static int __init nfs4blocklayout_init(void)

fs/nfs/blocklayout/dev.c

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ bl_free_deviceid_node(struct nfs4_deviceid_node *d) 
		container_of(d, struct pnfs_block_dev, node);



	bl_free_device(dev);

	kfree(dev);

	kfree_rcu(dev, node.rcu);

}



static int

fs/nfs/callback.c

+3 −3
Original line number Diff line number Diff line
@@ -128,7 +128,7 @@ nfs41_callback_svc(void *vrqstp) 
		if (try_to_freeze())

			continue;



		prepare_to_wait(&serv->sv_cb_waitq, &wq, TASK_UNINTERRUPTIBLE);

		prepare_to_wait(&serv->sv_cb_waitq, &wq, TASK_INTERRUPTIBLE);

		spin_lock_bh(&serv->sv_cb_lock);

		if (!list_empty(&serv->sv_cb_list)) {

			req = list_first_entry(&serv->sv_cb_list,
@@ -142,10 +142,10 @@ nfs41_callback_svc(void *vrqstp) 
				error);

		} else {

			spin_unlock_bh(&serv->sv_cb_lock);

			/* schedule_timeout to game the hung task watchdog */

			schedule_timeout(60 * HZ);

			schedule();

			finish_wait(&serv->sv_cb_waitq, &wq);

		}

		flush_signals(current);

	}

	return 0;

}

fs/nfs/client.c

+0 −1
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ 
#include <linux/lockd/bind.h>

#include <linux/seq_file.h>

#include <linux/mount.h>

#include <linux/nfs_idmap.h>

#include <linux/vfs.h>

#include <linux/inet.h>

#include <linux/in6.h>

CRA Git | Maintained and supported by SUSTech CRA and CCSE