Skip to contentSkip to conversation

nfsd changes for 5.3

GIT PULL Merged J. Bruce Fields 2 participants 2 messages Jul 10, 2019 – Jul 11, 2019

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

Please pull nfsd changes for 5.3:

git://linux-nfs.org/~bfields/linux.git tags/nfsd-5.3

Note there's a conflict with a mount API patch in the vfs tree; Stephen Rothwell's resolution in linux-next looks good.

Highlights:

- Add a new /proc/fs/nfsd/clients/ directory which exposes some long-requested information about NFSv4 clients (like open files) and allows forced revocation of client state.

- Replace the global duplicate reply cache by a cache per network namespace; previously, a request in one network namespace could incorrectly match an entry from another, though we haven't seen this in production. This is the last remaining container bug that I'm aware of; at this point you should be able to run separate nfsd's in each network namespace, each with their own set of exports, and everything should work.

- Cleanup and modify lock code to show the pid of lockd as the owner of NLM locks. This is the correct version of the bugfix originally attempted in b8eee0e90f97 "lockd: Show pid of lockd for remote locks".

--b.

----------------------------------------------------------------
Benjamin Coddington (5):
lockd: prepare nlm_lockowner for use by the server
lockd: Convert NLM service fl_owner to nlm_lockowner
lockd: Remove lm_compare_owner and lm_owner_key
lockd: Show pid of lockd for remote locks
locks: Cleanup lm_compare_owner and lm_owner_key

Denis Efremov (1):
sunrpc/cache: remove the exporting of cache_seq_next

Geert Uytterhoeven (1):
nfsd: Spelling s/EACCESS/EACCES/

J. Bruce Fields (23):
nfsd: don't call nfsd_reply_cache_shutdown twice
nfsd4: drc containerization
nfsd: note inadequate stats locking
nfsd: use 64-bit seconds fields in nfsd v4 code
nfsd4: remove outdated nfsd4_decode_time comment
nfsd: fix cleanup of nfsd_reply_cache_init on failure
nfs: fix out-of-date connectathon talk URL
nfsd: persist nfsd filesystem across mounts
nfsd: rename cl_refcount
nfsd4: use reference count to free client
nfsd: add nfsd/clients directory
nfsd: make client/ directory names small ints
nfsd4: add a client info file
nfsd: copy client's address including port number to cl_addr
nfsd: escape high characters in binary data
nfsd: add more information to client info file
nfsd4: add file to display list of client's opens
nfsd: show lock and deleg stateids
nfsd4: show layout stateids
nfsd: create get_nfsdfs_clp helper
nfsd: allow forced expiration of NFSv4 clients
nfsd: create xdr_netobj_dup helper
nfsd: decode implementation id

Joe Perches (1):
nfsd: Fix misuse of strlcpy

YueHaibing (3):
lockd: Make two symbols static
nfsd: Make two functions static
nfsd: Make __get_nfsdfs_client() static

 Documentation/filesystems/Locking |  14 --
 fs/lockd/clntproc.c               |  21 +-
 fs/lockd/svc4proc.c               |  14 +-
 fs/lockd/svclock.c                | 118 ++++++++--
 fs/lockd/svcproc.c                |  14 +-
 fs/lockd/svcsubs.c                |   2 +-
 fs/lockd/xdr.c                    |   3 -
 fs/lockd/xdr4.c                   |   3 -
 fs/locks.c                        |   5 -
 fs/nfsd/blocklayout.c             |   8 +-
 fs/nfsd/cache.h                   |   5 +-
 fs/nfsd/netns.h                   |  44 ++++
 fs/nfsd/nfs4idmap.c               |   2 +-
 fs/nfsd/nfs4state.c               | 453 +++++++++++++++++++++++++++++++++++---
 fs/nfsd/nfs4xdr.c                 |  38 ++--
 fs/nfsd/nfscache.c                | 236 ++++++++++----------
 fs/nfsd/nfsctl.c                  | 233 +++++++++++++++++++-
 fs/nfsd/nfsd.h                    |  11 +
 fs/nfsd/state.h                   |  11 +-
 fs/nfsd/vfs.c                     |   2 +-
 fs/nfsd/xdr4.h                    |   5 +-
 fs/seq_file.c                     |  11 +
 include/linux/fs.h                |   2 -
 include/linux/lockd/lockd.h       |   2 +
 include/linux/seq_file.h          |   1 +
 include/linux/string_helpers.h    |   3 +
 include/linux/sunrpc/xdr.h        |   7 +
 lib/string_helpers.c              |  19 ++
 net/sunrpc/cache.c                |   1 -
 net/sunrpc/svc_xprt.c             |   2 +-
 30 files changed, 1034 insertions(+), 256 deletions(-)