Merge branch 'for-3.7' of git://linux-nfs.org/~bfields/linux
Pull nfsd update from J Bruce Fields: "Another relatively quiet cycle. There was some progress on my remaining 4.1 todo's, but a couple of them were just of the form "check that we do X correctly", so didn't have much affect on the code. Other than that, a bunch of cleanup and some bugfixes (including an annoying NFSv4.0 state leak and a busy-loop in the server that could cause it to peg the CPU without making progress)." * 'for-3.7' of git://linux-nfs.org/~bfields/linux: (46 commits) UAPI: (Scripted) Disintegrate include/linux/sunrpc UAPI: (Scripted) Disintegrate include/linux/nfsd nfsd4: don't allow reclaims of expired clients nfsd4: remove redundant callback probe nfsd4: expire old client earlier nfsd4: separate session allocation and initialization nfsd4: clean up session allocation nfsd4: minor free_session cleanup nfsd4: new_conn_from_crses should only allocate nfsd4: separate connection allocation and initialization nfsd4: reject bad forechannel attrs earlier nfsd4: enforce per-client sessions/no-sessions distinction nfsd4: set cl_minorversion at create time nfsd4: don't pin clientids to pseudoflavors nfsd4: fix bind_conn_to_session xdr comment nfsd4: cast readlink() bug argument NFSD: pass null terminated buf to kstrtouint() nfsd: remove duplicate init in nfsd4_cb_recall nfsd4: eliminate redundant nfs4_free_stateid fs/nfsd/nfs4idmap.c: adjust inconsistent IS_ERR and PTR_ERR ...
This commit is contained in:
Linus Torvalds
@@ -1,5 +0,0 @@
|
||||
header-y += cld.h
|
||||
header-y += debug.h
|
||||
header-y += export.h
|
||||
header-y += nfsfh.h
|
||||
header-y += stats.h
|
||||
|
||||
@@ -1,56 +0,0 @@
|
||||
/*
|
||||
* Upcall description for nfsdcld communication
|
||||
*
|
||||
* Copyright (c) 2012 Red Hat, Inc.
|
||||
* Author(s): Jeff Layton <jlayton@redhat.com>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 2 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
*/
|
||||
|
||||
#ifndef _NFSD_CLD_H
|
||||
#define _NFSD_CLD_H
|
||||
|
||||
/* latest upcall version available */
|
||||
#define CLD_UPCALL_VERSION 1
|
||||
|
||||
/* defined by RFC3530 */
|
||||
#define NFS4_OPAQUE_LIMIT 1024
|
||||
|
||||
enum cld_command {
|
||||
Cld_Create, /* create a record for this cm_id */
|
||||
Cld_Remove, /* remove record of this cm_id */
|
||||
Cld_Check, /* is this cm_id allowed? */
|
||||
Cld_GraceDone, /* grace period is complete */
|
||||
};
|
||||
|
||||
/* representation of long-form NFSv4 client ID */
|
||||
struct cld_name {
|
||||
uint16_t cn_len; /* length of cm_id */
|
||||
unsigned char cn_id[NFS4_OPAQUE_LIMIT]; /* client-provided */
|
||||
} __attribute__((packed));
|
||||
|
||||
/* message struct for communication with userspace */
|
||||
struct cld_msg {
|
||||
uint8_t cm_vers; /* upcall version */
|
||||
uint8_t cm_cmd; /* upcall command */
|
||||
int16_t cm_status; /* return code */
|
||||
uint32_t cm_xid; /* transaction id */
|
||||
union {
|
||||
int64_t cm_gracetime; /* grace period start time */
|
||||
struct cld_name cm_name;
|
||||
} __attribute__((packed)) cm_u;
|
||||
} __attribute__((packed));
|
||||
|
||||
#endif /* !_NFSD_CLD_H */
|
||||
@@ -5,44 +5,15 @@
|
||||
*
|
||||
* Copyright (C) 1995 Olaf Kirch <okir@monad.swb.de>
|
||||
*/
|
||||
|
||||
#ifndef LINUX_NFSD_DEBUG_H
|
||||
#define LINUX_NFSD_DEBUG_H
|
||||
|
||||
#include <linux/sunrpc/debug.h>
|
||||
#include <uapi/linux/nfsd/debug.h>
|
||||
|
||||
/*
|
||||
* Enable debugging for nfsd.
|
||||
* Requires RPC_DEBUG.
|
||||
*/
|
||||
#ifdef RPC_DEBUG
|
||||
# define NFSD_DEBUG 1
|
||||
#endif
|
||||
|
||||
/*
|
||||
* knfsd debug flags
|
||||
*/
|
||||
#define NFSDDBG_SOCK 0x0001
|
||||
#define NFSDDBG_FH 0x0002
|
||||
#define NFSDDBG_EXPORT 0x0004
|
||||
#define NFSDDBG_SVC 0x0008
|
||||
#define NFSDDBG_PROC 0x0010
|
||||
#define NFSDDBG_FILEOP 0x0020
|
||||
#define NFSDDBG_AUTH 0x0040
|
||||
#define NFSDDBG_REPCACHE 0x0080
|
||||
#define NFSDDBG_XDR 0x0100
|
||||
#define NFSDDBG_LOCKD 0x0200
|
||||
#define NFSDDBG_ALL 0x7FFF
|
||||
#define NFSDDBG_NOCHANGE 0xFFFF
|
||||
|
||||
|
||||
#ifdef __KERNEL__
|
||||
# undef ifdebug
|
||||
# ifdef NFSD_DEBUG
|
||||
# define ifdebug(flag) if (nfsd_debug & NFSDDBG_##flag)
|
||||
# else
|
||||
# define ifdebug(flag) if (0)
|
||||
# endif
|
||||
#endif /* __KERNEL__ */
|
||||
|
||||
#endif /* LINUX_NFSD_DEBUG_H */
|
||||
|
||||
@@ -6,58 +6,11 @@
|
||||
*
|
||||
* Copyright (C) 1995-1997 Olaf Kirch <okir@monad.swb.de>
|
||||
*/
|
||||
|
||||
#ifndef NFSD_EXPORT_H
|
||||
#define NFSD_EXPORT_H
|
||||
|
||||
# include <linux/types.h>
|
||||
#ifdef __KERNEL__
|
||||
# include <linux/nfsd/nfsfh.h>
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Important limits for the exports stuff.
|
||||
*/
|
||||
#define NFSCLNT_IDMAX 1024
|
||||
#define NFSCLNT_ADDRMAX 16
|
||||
#define NFSCLNT_KEYMAX 32
|
||||
|
||||
/*
|
||||
* Export flags.
|
||||
*/
|
||||
#define NFSEXP_READONLY 0x0001
|
||||
#define NFSEXP_INSECURE_PORT 0x0002
|
||||
#define NFSEXP_ROOTSQUASH 0x0004
|
||||
#define NFSEXP_ALLSQUASH 0x0008
|
||||
#define NFSEXP_ASYNC 0x0010
|
||||
#define NFSEXP_GATHERED_WRITES 0x0020
|
||||
/* 40 80 100 currently unused */
|
||||
#define NFSEXP_NOHIDE 0x0200
|
||||
#define NFSEXP_NOSUBTREECHECK 0x0400
|
||||
#define NFSEXP_NOAUTHNLM 0x0800 /* Don't authenticate NLM requests - just trust */
|
||||
#define NFSEXP_MSNFS 0x1000 /* do silly things that MS clients expect; no longer supported */
|
||||
#define NFSEXP_FSID 0x2000
|
||||
#define NFSEXP_CROSSMOUNT 0x4000
|
||||
#define NFSEXP_NOACL 0x8000 /* reserved for possible ACL related use */
|
||||
/*
|
||||
* The NFSEXP_V4ROOT flag causes the kernel to give access only to NFSv4
|
||||
* clients, and only to the single directory that is the root of the
|
||||
* export; further lookup and readdir operations are treated as if every
|
||||
* subdirectory was a mountpoint, and ignored if they are not themselves
|
||||
* exported. This is used by nfsd and mountd to construct the NFSv4
|
||||
* pseudofilesystem, which provides access only to paths leading to each
|
||||
* exported filesystem.
|
||||
*/
|
||||
#define NFSEXP_V4ROOT 0x10000
|
||||
/* All flags that we claim to support. (Note we don't support NOACL.) */
|
||||
#define NFSEXP_ALLFLAGS 0x17E3F
|
||||
|
||||
/* The flags that may vary depending on security flavor: */
|
||||
#define NFSEXP_SECINFO_FLAGS (NFSEXP_READONLY | NFSEXP_ROOTSQUASH \
|
||||
| NFSEXP_ALLSQUASH \
|
||||
| NFSEXP_INSECURE_PORT)
|
||||
|
||||
#ifdef __KERNEL__
|
||||
#include <uapi/linux/nfsd/export.h>
|
||||
|
||||
/*
|
||||
* FS Locations
|
||||
@@ -154,7 +107,4 @@ static inline void exp_get(struct svc_export *exp)
|
||||
}
|
||||
struct svc_export * rqst_exp_find(struct svc_rqst *, int, u32 *);
|
||||
|
||||
#endif /* __KERNEL__ */
|
||||
|
||||
#endif /* NFSD_EXPORT_H */
|
||||
|
||||
|
||||
@@ -10,117 +10,11 @@
|
||||
*
|
||||
* Copyright (C) 1995, 1996, 1997 Olaf Kirch <okir@monad.swb.de>
|
||||
*/
|
||||
|
||||
#ifndef _LINUX_NFSD_FH_H
|
||||
#define _LINUX_NFSD_FH_H
|
||||
|
||||
#include <linux/types.h>
|
||||
#include <linux/nfs.h>
|
||||
#include <linux/nfs2.h>
|
||||
#include <linux/nfs3.h>
|
||||
#include <linux/nfs4.h>
|
||||
#ifdef __KERNEL__
|
||||
# include <linux/sunrpc/svc.h>
|
||||
#endif
|
||||
|
||||
/*
|
||||
* This is the old "dentry style" Linux NFSv2 file handle.
|
||||
*
|
||||
* The xino and xdev fields are currently used to transport the
|
||||
* ino/dev of the exported inode.
|
||||
*/
|
||||
struct nfs_fhbase_old {
|
||||
__u32 fb_dcookie; /* dentry cookie - always 0xfeebbaca */
|
||||
__u32 fb_ino; /* our inode number */
|
||||
__u32 fb_dirino; /* dir inode number, 0 for directories */
|
||||
__u32 fb_dev; /* our device */
|
||||
__u32 fb_xdev;
|
||||
__u32 fb_xino;
|
||||
__u32 fb_generation;
|
||||
};
|
||||
|
||||
/*
|
||||
* This is the new flexible, extensible style NFSv2/v3 file handle.
|
||||
* by Neil Brown <neilb@cse.unsw.edu.au> - March 2000
|
||||
*
|
||||
* The file handle starts with a sequence of four-byte words.
|
||||
* The first word contains a version number (1) and three descriptor bytes
|
||||
* that tell how the remaining 3 variable length fields should be handled.
|
||||
* These three bytes are auth_type, fsid_type and fileid_type.
|
||||
*
|
||||
* All four-byte values are in host-byte-order.
|
||||
*
|
||||
* The auth_type field specifies how the filehandle can be authenticated
|
||||
* This might allow a file to be confirmed to be in a writable part of a
|
||||
* filetree without checking the path from it up to the root.
|
||||
* Current values:
|
||||
* 0 - No authentication. fb_auth is 0 bytes long
|
||||
* Possible future values:
|
||||
* 1 - 4 bytes taken from MD5 hash of the remainer of the file handle
|
||||
* prefixed by a secret and with the important export flags.
|
||||
*
|
||||
* The fsid_type identifies how the filesystem (or export point) is
|
||||
* encoded.
|
||||
* Current values:
|
||||
* 0 - 4 byte device id (ms-2-bytes major, ls-2-bytes minor), 4byte inode number
|
||||
* NOTE: we cannot use the kdev_t device id value, because kdev_t.h
|
||||
* says we mustn't. We must break it up and reassemble.
|
||||
* 1 - 4 byte user specified identifier
|
||||
* 2 - 4 byte major, 4 byte minor, 4 byte inode number - DEPRECATED
|
||||
* 3 - 4 byte device id, encoded for user-space, 4 byte inode number
|
||||
* 4 - 4 byte inode number and 4 byte uuid
|
||||
* 5 - 8 byte uuid
|
||||
* 6 - 16 byte uuid
|
||||
* 7 - 8 byte inode number and 16 byte uuid
|
||||
*
|
||||
* The fileid_type identified how the file within the filesystem is encoded.
|
||||
* This is (will be) passed to, and set by, the underlying filesystem if it supports
|
||||
* filehandle operations. The filesystem must not use the value '0' or '0xff' and may
|
||||
* only use the values 1 and 2 as defined below:
|
||||
* Current values:
|
||||
* 0 - The root, or export point, of the filesystem. fb_fileid is 0 bytes.
|
||||
* 1 - 32bit inode number, 32 bit generation number.
|
||||
* 2 - 32bit inode number, 32 bit generation number, 32 bit parent directory inode number.
|
||||
*
|
||||
*/
|
||||
struct nfs_fhbase_new {
|
||||
__u8 fb_version; /* == 1, even => nfs_fhbase_old */
|
||||
__u8 fb_auth_type;
|
||||
__u8 fb_fsid_type;
|
||||
__u8 fb_fileid_type;
|
||||
__u32 fb_auth[1];
|
||||
/* __u32 fb_fsid[0]; floating */
|
||||
/* __u32 fb_fileid[0]; floating */
|
||||
};
|
||||
|
||||
struct knfsd_fh {
|
||||
unsigned int fh_size; /* significant for NFSv3.
|
||||
* Points to the current size while building
|
||||
* a new file handle
|
||||
*/
|
||||
union {
|
||||
struct nfs_fhbase_old fh_old;
|
||||
__u32 fh_pad[NFS4_FHSIZE/4];
|
||||
struct nfs_fhbase_new fh_new;
|
||||
} fh_base;
|
||||
};
|
||||
|
||||
#define ofh_dcookie fh_base.fh_old.fb_dcookie
|
||||
#define ofh_ino fh_base.fh_old.fb_ino
|
||||
#define ofh_dirino fh_base.fh_old.fb_dirino
|
||||
#define ofh_dev fh_base.fh_old.fb_dev
|
||||
#define ofh_xdev fh_base.fh_old.fb_xdev
|
||||
#define ofh_xino fh_base.fh_old.fb_xino
|
||||
#define ofh_generation fh_base.fh_old.fb_generation
|
||||
|
||||
#define fh_version fh_base.fh_new.fb_version
|
||||
#define fh_fsid_type fh_base.fh_new.fb_fsid_type
|
||||
#define fh_auth_type fh_base.fh_new.fb_auth_type
|
||||
#define fh_fileid_type fh_base.fh_new.fb_fileid_type
|
||||
#define fh_auth fh_base.fh_new.fb_auth
|
||||
#define fh_fsid fh_base.fh_new.fb_auth
|
||||
|
||||
#ifdef __KERNEL__
|
||||
#include <uapi/linux/nfsd/nfsfh.h>
|
||||
|
||||
static inline __u32 ino_t_to_u32(ino_t ino)
|
||||
{
|
||||
@@ -166,7 +60,4 @@ typedef struct svc_fh {
|
||||
|
||||
} svc_fh;
|
||||
|
||||
#endif /* __KERNEL__ */
|
||||
|
||||
|
||||
#endif /* _LINUX_NFSD_FH_H */
|
||||
|
||||
@@ -5,16 +5,11 @@
|
||||
*
|
||||
* Copyright (C) 1995, 1996 Olaf Kirch <okir@monad.swb.de>
|
||||
*/
|
||||
|
||||
#ifndef LINUX_NFSD_STATS_H
|
||||
#define LINUX_NFSD_STATS_H
|
||||
|
||||
#include <linux/nfs4.h>
|
||||
#include <uapi/linux/nfsd/stats.h>
|
||||
|
||||
/* thread usage wraps very million seconds (approx one fortnight) */
|
||||
#define NFSD_USAGE_WRAP (HZ*1000000)
|
||||
|
||||
#ifdef __KERNEL__
|
||||
|
||||
struct nfsd_stats {
|
||||
unsigned int rchits; /* repcache hits */
|
||||
@@ -47,5 +42,4 @@ extern struct svc_stat nfsd_svcstats;
|
||||
void nfsd_stat_init(void);
|
||||
void nfsd_stat_shutdown(void);
|
||||
|
||||
#endif /* __KERNEL__ */
|
||||
#endif /* LINUX_NFSD_STATS_H */
|
||||
|
||||
@@ -1 +0,0 @@
|
||||
header-y += debug.h
|
||||
|
||||
@@ -5,28 +5,11 @@
|
||||
*
|
||||
* Copyright (C) 1996, Olaf Kirch <okir@monad.swb.de>
|
||||
*/
|
||||
|
||||
#ifndef _LINUX_SUNRPC_DEBUG_H_
|
||||
#define _LINUX_SUNRPC_DEBUG_H_
|
||||
|
||||
/*
|
||||
* RPC debug facilities
|
||||
*/
|
||||
#define RPCDBG_XPRT 0x0001
|
||||
#define RPCDBG_CALL 0x0002
|
||||
#define RPCDBG_DEBUG 0x0004
|
||||
#define RPCDBG_NFS 0x0008
|
||||
#define RPCDBG_AUTH 0x0010
|
||||
#define RPCDBG_BIND 0x0020
|
||||
#define RPCDBG_SCHED 0x0040
|
||||
#define RPCDBG_TRANS 0x0080
|
||||
#define RPCDBG_SVCXPRT 0x0100
|
||||
#define RPCDBG_SVCDSP 0x0200
|
||||
#define RPCDBG_MISC 0x0400
|
||||
#define RPCDBG_CACHE 0x0800
|
||||
#define RPCDBG_ALL 0x7fff
|
||||
#include <uapi/linux/sunrpc/debug.h>
|
||||
|
||||
#ifdef __KERNEL__
|
||||
|
||||
/*
|
||||
* Enable RPC debugging/profiling.
|
||||
@@ -87,24 +70,4 @@ void rpc_register_sysctl(void);
|
||||
void rpc_unregister_sysctl(void);
|
||||
#endif
|
||||
|
||||
#endif /* __KERNEL__ */
|
||||
|
||||
/*
|
||||
* Declarations for the sysctl debug interface, which allows to read or
|
||||
* change the debug flags for rpc, nfs, nfsd, and lockd. Since the sunrpc
|
||||
* module currently registers its sysctl table dynamically, the sysctl path
|
||||
* for module FOO is <CTL_SUNRPC, CTL_FOODEBUG>.
|
||||
*/
|
||||
|
||||
enum {
|
||||
CTL_RPCDEBUG = 1,
|
||||
CTL_NFSDEBUG,
|
||||
CTL_NFSDDEBUG,
|
||||
CTL_NLMDEBUG,
|
||||
CTL_SLOTTABLE_UDP,
|
||||
CTL_SLOTTABLE_TCP,
|
||||
CTL_MIN_RESVPORT,
|
||||
CTL_MAX_RESVPORT,
|
||||
};
|
||||
|
||||
#endif /* _LINUX_SUNRPC_DEBUG_H_ */
|
||||
|
||||
@@ -114,7 +114,6 @@ void svc_xprt_init(struct net *, struct svc_xprt_class *, struct svc_xprt *,
|
||||
int svc_create_xprt(struct svc_serv *, const char *, struct net *,
|
||||
const int, const unsigned short, int);
|
||||
void svc_xprt_enqueue(struct svc_xprt *xprt);
|
||||
void svc_xprt_received(struct svc_xprt *);
|
||||
void svc_xprt_put(struct svc_xprt *xprt);
|
||||
void svc_xprt_copy_addrs(struct svc_rqst *rqstp, struct svc_xprt *xprt);
|
||||
void svc_close_xprt(struct svc_xprt *xprt);
|
||||
@@ -124,6 +123,7 @@ struct svc_xprt *svc_find_xprt(struct svc_serv *serv, const char *xcl_name,
|
||||
struct net *net, const sa_family_t af,
|
||||
const unsigned short port);
|
||||
int svc_xprt_names(struct svc_serv *serv, char *buf, const int buflen);
|
||||
void svc_add_new_perm_xprt(struct svc_serv *serv, struct svc_xprt *xprt);
|
||||
|
||||
static inline void svc_xprt_get(struct svc_xprt *xprt)
|
||||
{
|
||||
@@ -166,8 +166,7 @@ static inline size_t svc_addr_len(const struct sockaddr *sa)
|
||||
case AF_INET6:
|
||||
return sizeof(struct sockaddr_in6);
|
||||
}
|
||||
|
||||
return 0;
|
||||
BUG();
|
||||
}
|
||||
|
||||
static inline unsigned short svc_xprt_local_port(const struct svc_xprt *xprt)
|
||||
|
||||
@@ -39,9 +39,6 @@ int svc_recv(struct svc_rqst *, long);
|
||||
int svc_send(struct svc_rqst *);
|
||||
void svc_drop(struct svc_rqst *);
|
||||
void svc_sock_update_bufs(struct svc_serv *serv);
|
||||
int svc_sock_names(struct svc_serv *serv, char *buf,
|
||||
const size_t buflen,
|
||||
const char *toclose);
|
||||
int svc_addsock(struct svc_serv *serv, const int fd,
|
||||
char *name_return, const size_t len);
|
||||
void svc_init_xprt_sock(void);
|
||||
|
||||
Reference in New Issue
Block a user