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

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

Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6 

* 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6:
  SUNRPC: Fix the NFSv4 and RPCSEC_GSS Kconfig dependencies
  statfs() gives ESTALE error
  NFS: Fix a typo in nfs_sockaddr_match_ipaddr6
  sunrpc: increase MAX_HASHTABLE_BITS to 14
  gss:spkm3 miss returning error to caller when import security context
  gss:krb5 miss returning error to caller when import security context
  Remove incorrect do_vfs_lock message
  SUNRPC: cleanup state-machine ordering
  SUNRPC: Fix a race in rpc_info_open
  SUNRPC: Fix race corrupting rpc upcall
  Fix null dereference in call_allocate
parents 75e1c70f 827e3457

fs/nfs/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -63,6 +63,7 @@ config NFS_V3_ACL 
config NFS_V4

	bool "NFS client support for NFS version 4"

	depends on NFS_FS

	select SUNRPC_GSS

	help

	  This option enables support for version 4 of the NFS protocol

	  (RFC 3530) in the kernel's NFS client.

fs/nfs/client.c

+1 −1
Original line number Diff line number Diff line
@@ -275,7 +275,7 @@ static int nfs_sockaddr_match_ipaddr6(const struct sockaddr *sa1, 
	    sin1->sin6_scope_id != sin2->sin6_scope_id)

		return 0;



	return ipv6_addr_equal(&sin1->sin6_addr, &sin1->sin6_addr);

	return ipv6_addr_equal(&sin1->sin6_addr, &sin2->sin6_addr);

}

#else	/* !defined(CONFIG_IPV6) && !defined(CONFIG_IPV6_MODULE) */

static int nfs_sockaddr_match_ipaddr6(const struct sockaddr *sa1,

fs/nfs/file.c

+0 −4
Original line number Diff line number Diff line
@@ -723,10 +723,6 @@ static int do_vfs_lock(struct file *file, struct file_lock *fl) 
		default:

			BUG();

	}

	if (res < 0)

		dprintk(KERN_WARNING "%s: VFS is out of sync with lock manager"

			" - error %d!\n",

				__func__, res);

	return res;

}

fs/nfs/super.c

+8 −0
Original line number Diff line number Diff line
@@ -431,7 +431,15 @@ static int nfs_statfs(struct dentry *dentry, struct kstatfs *buf) 
		goto out_err;



	error = server->nfs_client->rpc_ops->statfs(server, fh, &res);

	if (unlikely(error == -ESTALE)) {

		struct dentry *pd_dentry;



		pd_dentry = dget_parent(dentry);

		if (pd_dentry != NULL) {

			nfs_zap_caches(pd_dentry->d_inode);

			dput(pd_dentry);

		}

	}

	nfs_free_fattr(res.fattr);

	if (error < 0)

		goto out_err;

fs/nfsd/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -69,6 +69,7 @@ config NFSD_V4 
	depends on NFSD && PROC_FS && EXPERIMENTAL

	select NFSD_V3

	select FS_POSIX_ACL

	select SUNRPC_GSS

	help

	  This option enables support in your system's NFS server for

	  version 4 of the NFS protocol (RFC 3530).