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

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

Merge branch 'for-3.14' of git://linux-nfs.org/~bfields/linux 

Pull nfsd updates from Bruce Fields:
 - Handle some loose ends from the vfs read delegation support.
   (For example nfsd can stop breaking leases on its own in a
    fewer places where it can now depend on the vfs to.)
 - Make life a little easier for NFSv4-only configurations
   (thanks to Kinglong Mee).
 - Fix some gss-proxy problems (thanks Jeff Layton).
 - miscellaneous bug fixes and cleanup

* 'for-3.14' of git://linux-nfs.org/~bfields/linux: (38 commits)
  nfsd: consider CLAIM_FH when handing out delegation
  nfsd4: fix delegation-unlink/rename race
  nfsd4: delay setting current_fh in open
  nfsd4: minor nfs4_setlease cleanup
  gss_krb5: use lcm from kernel lib
  nfsd4: decrease nfsd4_encode_fattr stack usage
  nfsd: fix encode_entryplus_baggage stack usage
  nfsd4: simplify xdr encoding of nfsv4 names
  nfsd4: encode_rdattr_error cleanup
  nfsd4: nfsd4_encode_fattr cleanup
  minor svcauth_gss.c cleanup
  nfsd4: better VERIFY comment
  nfsd4: break only delegations when appropriate
  NFSD: Fix a memory leak in nfsd4_create_session
  sunrpc: get rid of use_gssp_lock
  sunrpc: fix potential race between setting use_gss_proxy and the upcall rpc_clnt
  sunrpc: don't wait for write before allowing reads from use-gss-proxy file
  nfsd: get rid of unused function definition
  Define op_iattr for nfsd4_open instead using macro
  NFSD: fix compile warning without CONFIG_NFSD_V3
  ...
parents dfa19426 ed47b062

Documentation/filesystems/nfs/nfs41-server.txt

+14 −28
Original line number Diff line number Diff line
@@ -5,11 +5,11 @@ Server support for minorversion 1 can be controlled using the 
by reading this file will contain either "+4.1" or "-4.1"

correspondingly.



Currently, server support for minorversion 1 is disabled by default.

It can be enabled at run time by writing the string "+4.1" to

Currently, server support for minorversion 1 is enabled by default.

It can be disabled at run time by writing the string "-4.1" to

the /proc/fs/nfsd/versions control file.  Note that to write this

control file, the nfsd service must be taken down.  Use your user-mode

nfs-utils to set this up; see rpc.nfsd(8)

control file, the nfsd service must be taken down.  You can use rpc.nfsd

for this; see rpc.nfsd(8).



(Warning: older servers will interpret "+4.1" and "-4.1" as "+4" and

"-4", respectively.  Therefore, code meant to work on both new and old
@@ -29,29 +29,6 @@ are still under development out of tree. 
See http://wiki.linux-nfs.org/wiki/index.php/PNFS_prototype_design

for more information.



The current implementation is intended for developers only: while it

does support ordinary file operations on clients we have tested against

(including the linux client), it is incomplete in ways which may limit

features unexpectedly, cause known bugs in rare cases, or cause

interoperability problems with future clients.  Known issues:



	- gss support is questionable: currently mounts with kerberos

	  from a linux client are possible, but we aren't really

	  conformant with the spec (for example, we don't use kerberos

	  on the backchannel correctly).

	- We do not support SSV, which provides security for shared

	  client-server state (thus preventing unauthorized tampering

	  with locks and opens, for example).  It is mandatory for

	  servers to support this, though no clients use it yet.



In addition, some limitations are inherited from the current NFSv4

implementation:



	- Incomplete delegation enforcement: if a file is renamed or

	  unlinked by a local process, a client holding a delegation may

	  continue to indefinitely allow opens of the file under the old

	  name.



The table below, taken from the NFSv4.1 document, lists

the operations that are mandatory to implement (REQ), optional

(OPT), and NFSv4.0 operations that are required not to implement (MNI)
@@ -169,6 +146,16 @@ NS*| CB_WANTS_CANCELLED | OPT | FDELG, | Section 20.10 | 


Implementation notes:



SSV:

* The spec claims this is mandatory, but we don't actually know of any

  implementations, so we're ignoring it for now.  The server returns

  NFS4ERR_ENCR_ALG_UNSUPP on EXCHANGE_ID, which should be future-proof.



GSS on the backchannel:

* Again, theoretically required but not widely implemented (in

  particular, the current Linux client doesn't request it).  We return

  NFS4ERR_ENCR_ALG_UNSUPP on CREATE_SESSION.



DELEGPURGE:

* mandatory only for servers that support CLAIM_DELEGATE_PREV and/or

  CLAIM_DELEG_PREV_FH (which allows clients to keep delegations that
@@ -176,7 +163,6 @@ DELEGPURGE: 
  now.



EXCHANGE_ID:

* only SP4_NONE state protection supported

* implementation ids are ignored



CREATE_SESSION:

fs/nfsd/acl.h

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ struct svc_rqst; 


struct nfs4_acl *nfs4_acl_new(int);

int nfs4_acl_get_whotype(char *, u32);

int nfs4_acl_write_who(int who, char *p);

__be32 nfs4_acl_write_who(int who, __be32 **p, int *len);



int nfsd4_get_nfs4_acl(struct svc_rqst *rqstp, struct dentry *dentry,

		struct nfs4_acl **acl);

fs/nfsd/cache.h

+0 −8
Original line number Diff line number Diff line
@@ -84,12 +84,4 @@ int nfsd_cache_lookup(struct svc_rqst *); 
void	nfsd_cache_update(struct svc_rqst *, int, __be32 *);

int	nfsd_reply_cache_stats_open(struct inode *, struct file *);



#ifdef CONFIG_NFSD_V4

void	nfsd4_set_statp(struct svc_rqst *rqstp, __be32 *statp);

#else  /* CONFIG_NFSD_V4 */

static inline void nfsd4_set_statp(struct svc_rqst *rqstp, __be32 *statp)

{

}

#endif /* CONFIG_NFSD_V4 */



#endif /* NFSCACHE_H */

fs/nfsd/idmap.h

+2 −2
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ static inline void nfsd_idmap_shutdown(struct net *net) 


__be32 nfsd_map_name_to_uid(struct svc_rqst *, const char *, size_t, kuid_t *);

__be32 nfsd_map_name_to_gid(struct svc_rqst *, const char *, size_t, kgid_t *);

int nfsd_map_uid_to_name(struct svc_rqst *, kuid_t, char *);

int nfsd_map_gid_to_name(struct svc_rqst *, kgid_t, char *);

__be32 nfsd4_encode_user(struct svc_rqst *, kuid_t, __be32 **, int *);

__be32 nfsd4_encode_group(struct svc_rqst *, kgid_t, __be32 **, int *);



#endif /* LINUX_NFSD_IDMAP_H */

fs/nfsd/netns.h

+1 −0
Original line number Diff line number Diff line
@@ -95,6 +95,7 @@ struct nfsd_net { 
	time_t nfsd4_grace;



	bool nfsd_net_up;

	bool lockd_up;



	/*

	 * Time of server startup