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

Commit 29be6345 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'nfs-for-3.13-3' of git://git.linux-nfs.org/projects/trondmy/linux-nfs 

Pull NFS client bugfixes from Trond Myklebust:
 - Stable fix for a NFSv4.1 delegation and state recovery deadlock
 - Stable fix for a loop on irrecoverable errors when returning
   delegations
 - Fix a 3-way deadlock between layoutreturn, open, and state recovery
 - Update the MAINTAINERS file with contact information for Trond
   Myklebust
 - Close needs to handle NFS4ERR_ADMIN_REVOKED
 - Enabling v4.2 should not recompile nfsd and lockd
 - Fix a couple of compile warnings

* tag 'nfs-for-3.13-3' of git://git.linux-nfs.org/projects/trondmy/linux-nfs:
  nfs: fix do_div() warning by instead using sector_div()
  MAINTAINERS: Update contact information for Trond Myklebust
  NFSv4.1: Prevent a 3-way deadlock between layoutreturn, open and state recovery
  SUNRPC: do not fail gss proc NULL calls with EACCES
  NFSv4: close needs to handle NFS4ERR_ADMIN_REVOKED
  NFSv4: Update list of irrecoverable errors on DELEGRETURN
  NFSv4 wait on recovery for async session errors
  NFS: Fix a warning in nfs_setsecurity
  NFS: Enabling v4.2 should not recompile nfsd and lockd
parents ef1e4e32 3873d064

MAINTAINERS

+2 −2
Original line number Diff line number Diff line
@@ -5980,10 +5980,10 @@ F: drivers/nfc/ 
F:	include/linux/platform_data/pn544.h



NFS, SUNRPC, AND LOCKD CLIENTS

M:	Trond Myklebust <Trond.Myklebust@netapp.com>

M:	Trond Myklebust <trond.myklebust@primarydata.com>

L:	linux-nfs@vger.kernel.org

W:	http://client.linux-nfs.org

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

T:	git git://git.linux-nfs.org/projects/trondmy/linux-nfs.git

S:	Maintained

F:	fs/lockd/

F:	fs/nfs/

fs/nfs/blocklayout/blocklayout.h

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

#include <linux/sunrpc/rpc_pipe_fs.h>



#include "../nfs4_fs.h"

#include "../pnfs.h"

#include "../netns.h"

fs/nfs/blocklayout/extents.c

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ 
static inline sector_t normalize(sector_t s, int base)

{

	sector_t tmp = s; /* Since do_div modifies its argument */

	return s - do_div(tmp, base);

	return s - sector_div(tmp, base);

}



static inline sector_t normalize_up(sector_t s, int base)

fs/nfs/dns_resolve.c

+2 −0
Original line number Diff line number Diff line
@@ -46,7 +46,9 @@ ssize_t nfs_dns_resolve_name(struct net *net, char *name, size_t namelen, 
#include <linux/sunrpc/cache.h>

#include <linux/sunrpc/svcauth.h>

#include <linux/sunrpc/rpc_pipe_fs.h>

#include <linux/nfs_fs.h>



#include "nfs4_fs.h"

#include "dns_resolve.h"

#include "cache_lib.h"

#include "netns.h"

fs/nfs/inode.c

+1 −1
Original line number Diff line number Diff line
@@ -312,7 +312,7 @@ struct nfs4_label *nfs4_label_alloc(struct nfs_server *server, gfp_t flags) 
}

EXPORT_SYMBOL_GPL(nfs4_label_alloc);

#else

void inline nfs_setsecurity(struct inode *inode, struct nfs_fattr *fattr,

void nfs_setsecurity(struct inode *inode, struct nfs_fattr *fattr,

					struct nfs4_label *label)

{

}