Please pull nfsd changes for 4.0 from:
git://linux-nfs.org/~bfields/linux.git for-4.0
A quiet cycle this time; this is basically entirely bugfixes. The few
that aren't cc'd to stable are cleanup or seemed unlikely to affect
anyone much.
--b.
----------------------------------------------------------------
Andreas Gruenbacher (1):
uapi: Remove kernel internal declaration
Chengyu Song (1):
nfsd: NFSD_FAULT_INJECTION depends on DEBUG_FS
Christoph Hellwig (1):
nfsd: add NFSEXP_PNFS to the exflags array
Giuseppe Cantavenera (1):
nfsd: fix nsfd startup race triggering BUG_ON
J. Bruce Fields (4):
nfsd: allow setting acls with unenforceable DENYs
nfsd4: disallow ALLOCATE with special stateids
nfsd4: disallow SEEK with special stateids
nfsd4: fix READ permission checking
Jeff Layton (2):
nfsd: remove bogus setting of status in nfsd4_process_open2
nfsd: remove unused status arg to nfsd4_cleanup_open_state
Kinglong Mee (3):
NFSD: Using path_equal() for checking two paths
NFSD: Use correct reply size calculating function
nfsd: Remove duplicate macro define for max sec label length
Mark Salter (1):
nfsd: eliminate NFSD_DEBUG
fs/lockd/svcsubs.c | 2 +-
fs/nfsd/Kconfig | 2 +-
fs/nfsd/export.c | 4 ++--
fs/nfsd/nfs4acl.c | 50 +---------------------------------------
fs/nfsd/nfs4proc.c | 12 ++++++----
fs/nfsd/nfs4state.c | 5 ++--
fs/nfsd/nfs4xdr.c | 16 ++++++++-----
fs/nfsd/nfsctl.c | 16 ++++++-------
fs/nfsd/nfsd.h | 2 +-
fs/nfsd/xdr4.h | 3 +--
include/linux/nfs4.h | 7 ++++++
include/uapi/linux/nfs4.h | 7 ------
include/uapi/linux/nfsd/debug.h | 8 -------
include/uapi/linux/nfsd/export.h | 3 +++
14 files changed, 45 insertions(+), 92 deletions(-)
On Thu, Apr 23, 2015 at 8:12 AM, J. Bruce Fields <[email protected]> wrote:
> Please pull nfsd changes for 4.0 from:
>
> git://linux-nfs.org/~bfields/linux.git for-4.0
You meant "for-4.1".
Please script this better so that the pull target itself is also part
of the script - clearly you used the right name at some point since
the shortlog and diffstat is about the right for-4.1 branch...
Linus
On Fri, Apr 24, 2015 at 07:47:59AM -0700, Linus Torvalds wrote:
> On Thu, Apr 23, 2015 at 8:12 AM, J. Bruce Fields <[email protected]> wrote:
> > Please pull nfsd changes for 4.0 from:
> >
> > git://linux-nfs.org/~bfields/linux.git for-4.0
>
> You meant "for-4.1".
Yes.
> Please script this better so that the pull target itself is also part
> of the script - clearly you used the right name at some point since
> the shortlog and diffstat is about the right for-4.1 branch...
My (trivial) script was doing "git request-pull origin <url>" which
leaves request-pull to pick a matching ref name at random, which I was
then fixing up by hand. If I pass the right branch name as the third
argument, the problem's fixed--done, thanks.
--b.