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

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

Merge git://git.linux-nfs.org/pub/linux/nfs-2.6 

* git://git.linux-nfs.org/pub/linux/nfs-2.6: (131 commits)
  NFSv4: Fix a typo in nfs_inode_reclaim_delegation
  NFS: Add a boot parameter to disable 64 bit inode numbers
  NFS: nfs_refresh_inode should clear cache_validity flags on success
  NFS: Fix a connectathon regression in NFSv3 and NFSv4
  NFS: Use nfs_refresh_inode() in ops that aren't expected to change the inode
  SUNRPC: Don't call xprt_release in call refresh
  SUNRPC: Don't call xprt_release() if call_allocate fails
  SUNRPC: Fix buggy UDP transmission
  [23/37] Clean up duplicate includes in
  [2.6 patch] net/sunrpc/rpcb_clnt.c: make struct rpcb_program static
  SUNRPC: Use correct type in buffer length calculations
  SUNRPC: Fix default hostname created in rpc_create()
  nfs: add server port to rpc_pipe info file
  NFS: Get rid of some obsolete macros
  NFS: Simplify filehandle revalidation
  NFS: Ensure that nfs_link() returns a hashed dentry
  NFS: Be strict about dentry revalidation when doing exclusive create
  NFS: Don't zap the readdir caches upon error
  NFS: Remove the redundant nfs_reval_fsid()
  NFSv3: Always use directory post-op attributes in nfs3_proc_lookup
  ...

Fix up trivial conflict due to sock_owned_by_user() cleanup manually in
net/sunrpc/xprtsock.c
parents 419217cb 05c88bab

Documentation/kernel-parameters.txt

+7 −0
Original line number Diff line number Diff line
@@ -1083,6 +1083,13 @@ and is between 256 and 4096 characters. It is defined in the file 
			[NFS] set the maximum lifetime for idmapper cache

			entries.



	nfs.enable_ino64=

			[NFS] enable 64-bit inode numbers.

			If zero, the NFS client will fake up a 32-bit inode

			number for the readdir() and stat() syscalls instead

			of returning the full 64-bit number.

			The default is to return 64-bit inode numbers.



	nmi_watchdog=	[KNL,BUGS=X86-32] Debugging features for SMP kernels



	no387		[BUGS=X86-32] Tells the kernel to use the 387 maths

fs/Kconfig

+8 −0
Original line number Diff line number Diff line
@@ -1755,6 +1755,14 @@ config SUNRPC 
config SUNRPC_GSS

	tristate



config SUNRPC_XPRT_RDMA

	tristate "RDMA transport for sunrpc (EXPERIMENTAL)"

	depends on SUNRPC && INFINIBAND && EXPERIMENTAL

	default m

	help

	  Adds a client RPC transport for supporting kernel NFS over RDMA

	  mounts, including Infiniband and iWARP. Experimental.



config SUNRPC_BIND34

	bool "Support for rpcbind versions 3 & 4 (EXPERIMENTAL)"

	depends on SUNRPC && EXPERIMENTAL

fs/lockd/mon.c

+2 −1
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 
#include <linux/utsname.h>

#include <linux/kernel.h>

#include <linux/sunrpc/clnt.h>

#include <linux/sunrpc/xprtsock.h>

#include <linux/sunrpc/svc.h>

#include <linux/lockd/lockd.h>

#include <linux/lockd/sm_inter.h>
@@ -132,7 +133,7 @@ nsm_create(void) 
		.sin_port	= 0,

	};

	struct rpc_create_args args = {

		.protocol	= IPPROTO_UDP,

		.protocol	= XPRT_TRANSPORT_UDP,

		.address	= (struct sockaddr *)&sin,

		.addrsize	= sizeof(sin),

		.servername	= "localhost",

fs/lockd/xdr.c

+4 −4
Original line number Diff line number Diff line
@@ -62,8 +62,9 @@ static __be32 *nlm_decode_cookie(__be32 *p, struct nlm_cookie *c) 
	}

	else 

	{

		printk(KERN_NOTICE

			"lockd: bad cookie size %d (only cookies under %d bytes are supported.)\n", len, NLM_MAXCOOKIELEN);

		dprintk("lockd: bad cookie size %d (only cookies under "

			"%d bytes are supported.)\n",

				len, NLM_MAXCOOKIELEN);

		return NULL;

	}

	return p;
@@ -84,8 +85,7 @@ nlm_decode_fh(__be32 *p, struct nfs_fh *f) 
	unsigned int	len;



	if ((len = ntohl(*p++)) != NFS2_FHSIZE) {

		printk(KERN_NOTICE

			"lockd: bad fhandle size %d (should be %d)\n",

		dprintk("lockd: bad fhandle size %d (should be %d)\n",

			len, NFS2_FHSIZE);

		return NULL;

	}

fs/lockd/xdr4.c

+4 −4
Original line number Diff line number Diff line
@@ -64,8 +64,9 @@ nlm4_decode_cookie(__be32 *p, struct nlm_cookie *c) 
	}

	else 

	{

		printk(KERN_NOTICE

			"lockd: bad cookie size %d (only cookies under %d bytes are supported.)\n", len, NLM_MAXCOOKIELEN);

		dprintk("lockd: bad cookie size %d (only cookies under "

			"%d bytes are supported.)\n",

				len, NLM_MAXCOOKIELEN);

		return NULL;

	}

	return p;
@@ -86,8 +87,7 @@ nlm4_decode_fh(__be32 *p, struct nfs_fh *f) 
	memset(f->data, 0, sizeof(f->data));

	f->size = ntohl(*p++);

	if (f->size > NFS_MAXFHSIZE) {

		printk(KERN_NOTICE

			"lockd: bad fhandle size %d (should be <=%d)\n",

		dprintk("lockd: bad fhandle size %d (should be <=%d)\n",

			f->size, NFS_MAXFHSIZE);

		return NULL;

	}