2005-04-16 16:20:36 -06:00
|
|
|
#ifndef _LINUX_NFS_XDR_H
|
|
|
|
#define _LINUX_NFS_XDR_H
|
|
|
|
|
2005-06-22 11:16:27 -06:00
|
|
|
#include <linux/nfsacl.h>
|
2011-03-24 11:12:29 -06:00
|
|
|
#include <linux/sunrpc/gss_api.h>
|
2005-04-16 16:20:36 -06:00
|
|
|
|
2005-11-30 16:09:02 -07:00
|
|
|
/*
|
|
|
|
* To change the maximum rsize and wsize supported by the NFS client, adjust
|
|
|
|
* NFS_MAX_FILE_IO_SIZE. 64KB is a typical maximum, but some servers can
|
|
|
|
* support a megabyte or more. The default is left at 4096 bytes, which is
|
|
|
|
* reasonable for NFS over UDP.
|
|
|
|
*/
|
|
|
|
#define NFS_MAX_FILE_IO_SIZE (1048576U)
|
|
|
|
#define NFS_DEF_FILE_IO_SIZE (4096U)
|
|
|
|
#define NFS_MIN_FILE_IO_SIZE (1024U)
|
|
|
|
|
2012-01-07 11:22:46 -07:00
|
|
|
struct nfs4_string {
|
|
|
|
unsigned int len;
|
|
|
|
char *data;
|
|
|
|
};
|
|
|
|
|
2006-06-09 07:34:19 -06:00
|
|
|
struct nfs_fsid {
|
|
|
|
uint64_t major;
|
|
|
|
uint64_t minor;
|
2005-04-16 16:20:36 -06:00
|
|
|
};
|
|
|
|
|
2006-06-09 07:34:19 -06:00
|
|
|
/*
|
|
|
|
* Helper for checking equality between 2 fsids.
|
|
|
|
*/
|
|
|
|
static inline int nfs_fsid_equal(const struct nfs_fsid *a, const struct nfs_fsid *b)
|
|
|
|
{
|
|
|
|
return a->major == b->major && a->minor == b->minor;
|
|
|
|
}
|
|
|
|
|
2012-05-23 03:02:34 -06:00
|
|
|
struct nfs4_threshold {
|
|
|
|
__u32 bm;
|
|
|
|
__u32 l_type;
|
|
|
|
__u64 rd_sz;
|
|
|
|
__u64 wr_sz;
|
|
|
|
__u64 rd_io_sz;
|
|
|
|
__u64 wr_io_sz;
|
|
|
|
};
|
|
|
|
|
2005-04-16 16:20:36 -06:00
|
|
|
struct nfs_fattr {
|
2009-03-11 12:10:24 -06:00
|
|
|
unsigned int valid; /* which fields are valid */
|
2009-03-11 12:10:26 -06:00
|
|
|
umode_t mode;
|
2005-04-16 16:20:36 -06:00
|
|
|
__u32 nlink;
|
2013-02-01 15:16:29 -07:00
|
|
|
kuid_t uid;
|
|
|
|
kgid_t gid;
|
2008-08-26 09:23:20 -06:00
|
|
|
dev_t rdev;
|
2005-04-16 16:20:36 -06:00
|
|
|
__u64 size;
|
|
|
|
union {
|
|
|
|
struct {
|
|
|
|
__u32 blocksize;
|
|
|
|
__u32 blocks;
|
|
|
|
} nfs2;
|
|
|
|
struct {
|
|
|
|
__u64 used;
|
|
|
|
} nfs3;
|
|
|
|
} du;
|
2006-06-09 07:34:19 -06:00
|
|
|
struct nfs_fsid fsid;
|
2005-04-16 16:20:36 -06:00
|
|
|
__u64 fileid;
|
2011-04-27 11:47:52 -06:00
|
|
|
__u64 mounted_on_fileid;
|
2005-04-16 16:20:36 -06:00
|
|
|
struct timespec atime;
|
|
|
|
struct timespec mtime;
|
|
|
|
struct timespec ctime;
|
|
|
|
__u64 change_attr; /* NFSv4 change attribute */
|
|
|
|
__u64 pre_change_attr;/* pre-op NFSv4 change attribute */
|
2009-03-11 12:10:25 -06:00
|
|
|
__u64 pre_size; /* pre_op_attr.size */
|
|
|
|
struct timespec pre_mtime; /* pre_op_attr.mtime */
|
|
|
|
struct timespec pre_ctime; /* pre_op_attr.ctime */
|
2005-10-27 20:12:39 -06:00
|
|
|
unsigned long time_start;
|
2008-10-14 17:16:07 -06:00
|
|
|
unsigned long gencount;
|
2012-01-07 11:22:46 -07:00
|
|
|
struct nfs4_string *owner_name;
|
|
|
|
struct nfs4_string *group_name;
|
2012-05-23 03:02:34 -06:00
|
|
|
struct nfs4_threshold *mdsthreshold; /* pNFS threshold hints */
|
2005-04-16 16:20:36 -06:00
|
|
|
};
|
|
|
|
|
2009-03-11 12:10:24 -06:00
|
|
|
#define NFS_ATTR_FATTR_TYPE (1U << 0)
|
|
|
|
#define NFS_ATTR_FATTR_MODE (1U << 1)
|
|
|
|
#define NFS_ATTR_FATTR_NLINK (1U << 2)
|
|
|
|
#define NFS_ATTR_FATTR_OWNER (1U << 3)
|
|
|
|
#define NFS_ATTR_FATTR_GROUP (1U << 4)
|
|
|
|
#define NFS_ATTR_FATTR_RDEV (1U << 5)
|
|
|
|
#define NFS_ATTR_FATTR_SIZE (1U << 6)
|
|
|
|
#define NFS_ATTR_FATTR_PRESIZE (1U << 7)
|
|
|
|
#define NFS_ATTR_FATTR_BLOCKS_USED (1U << 8)
|
|
|
|
#define NFS_ATTR_FATTR_SPACE_USED (1U << 9)
|
|
|
|
#define NFS_ATTR_FATTR_FSID (1U << 10)
|
|
|
|
#define NFS_ATTR_FATTR_FILEID (1U << 11)
|
|
|
|
#define NFS_ATTR_FATTR_ATIME (1U << 12)
|
|
|
|
#define NFS_ATTR_FATTR_MTIME (1U << 13)
|
|
|
|
#define NFS_ATTR_FATTR_CTIME (1U << 14)
|
|
|
|
#define NFS_ATTR_FATTR_PREMTIME (1U << 15)
|
|
|
|
#define NFS_ATTR_FATTR_PRECTIME (1U << 16)
|
|
|
|
#define NFS_ATTR_FATTR_CHANGE (1U << 17)
|
|
|
|
#define NFS_ATTR_FATTR_PRECHANGE (1U << 18)
|
2012-03-01 15:01:57 -07:00
|
|
|
#define NFS_ATTR_FATTR_V4_LOCATIONS (1U << 19)
|
|
|
|
#define NFS_ATTR_FATTR_V4_REFERRAL (1U << 20)
|
|
|
|
#define NFS_ATTR_FATTR_MOUNTPOINT (1U << 21)
|
|
|
|
#define NFS_ATTR_FATTR_MOUNTED_ON_FILEID (1U << 22)
|
|
|
|
#define NFS_ATTR_FATTR_OWNER_NAME (1U << 23)
|
|
|
|
#define NFS_ATTR_FATTR_GROUP_NAME (1U << 24)
|
2013-05-22 10:50:39 -06:00
|
|
|
#define NFS_ATTR_FATTR_V4_SECURITY_LABEL (1U << 25)
|
2009-03-11 12:10:24 -06:00
|
|
|
|
|
|
|
#define NFS_ATTR_FATTR (NFS_ATTR_FATTR_TYPE \
|
|
|
|
| NFS_ATTR_FATTR_MODE \
|
|
|
|
| NFS_ATTR_FATTR_NLINK \
|
|
|
|
| NFS_ATTR_FATTR_OWNER \
|
|
|
|
| NFS_ATTR_FATTR_GROUP \
|
|
|
|
| NFS_ATTR_FATTR_RDEV \
|
|
|
|
| NFS_ATTR_FATTR_SIZE \
|
|
|
|
| NFS_ATTR_FATTR_FSID \
|
|
|
|
| NFS_ATTR_FATTR_FILEID \
|
|
|
|
| NFS_ATTR_FATTR_ATIME \
|
|
|
|
| NFS_ATTR_FATTR_MTIME \
|
2012-04-27 11:48:18 -06:00
|
|
|
| NFS_ATTR_FATTR_CTIME \
|
|
|
|
| NFS_ATTR_FATTR_CHANGE)
|
2009-03-11 12:10:24 -06:00
|
|
|
#define NFS_ATTR_FATTR_V2 (NFS_ATTR_FATTR \
|
|
|
|
| NFS_ATTR_FATTR_BLOCKS_USED)
|
|
|
|
#define NFS_ATTR_FATTR_V3 (NFS_ATTR_FATTR \
|
|
|
|
| NFS_ATTR_FATTR_SPACE_USED)
|
|
|
|
#define NFS_ATTR_FATTR_V4 (NFS_ATTR_FATTR \
|
2013-05-22 10:50:39 -06:00
|
|
|
| NFS_ATTR_FATTR_SPACE_USED \
|
|
|
|
| NFS_ATTR_FATTR_V4_SECURITY_LABEL)
|
2005-04-16 16:20:36 -06:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Info on the file system
|
|
|
|
*/
|
|
|
|
struct nfs_fsinfo {
|
|
|
|
struct nfs_fattr *fattr; /* Post-op attributes */
|
|
|
|
__u32 rtmax; /* max. read transfer size */
|
|
|
|
__u32 rtpref; /* pref. read transfer size */
|
|
|
|
__u32 rtmult; /* reads should be multiple of this */
|
|
|
|
__u32 wtmax; /* max. write transfer size */
|
|
|
|
__u32 wtpref; /* pref. write transfer size */
|
|
|
|
__u32 wtmult; /* writes should be multiple of this */
|
|
|
|
__u32 dtpref; /* pref. readdir transfer size */
|
|
|
|
__u64 maxfilesize;
|
2010-10-12 17:30:05 -06:00
|
|
|
struct timespec time_delta; /* server time granularity */
|
2005-04-16 16:20:36 -06:00
|
|
|
__u32 lease_time; /* in seconds */
|
2010-10-19 22:17:57 -06:00
|
|
|
__u32 layouttype; /* supported pnfs layout driver */
|
2011-07-30 18:52:37 -06:00
|
|
|
__u32 blksize; /* preferred pnfs io block size */
|
2005-04-16 16:20:36 -06:00
|
|
|
};
|
|
|
|
|
|
|
|
struct nfs_fsstat {
|
|
|
|
struct nfs_fattr *fattr; /* Post-op attributes */
|
|
|
|
__u64 tbytes; /* total size in bytes */
|
|
|
|
__u64 fbytes; /* # of free bytes */
|
|
|
|
__u64 abytes; /* # of bytes available to user */
|
|
|
|
__u64 tfiles; /* # of files */
|
|
|
|
__u64 ffiles; /* # of free files */
|
|
|
|
__u64 afiles; /* # of files available to user */
|
|
|
|
};
|
|
|
|
|
|
|
|
struct nfs2_fsstat {
|
|
|
|
__u32 tsize; /* Server transfer size */
|
|
|
|
__u32 bsize; /* Filesystem block size */
|
|
|
|
__u32 blocks; /* No. of "bsize" blocks on filesystem */
|
|
|
|
__u32 bfree; /* No. of free "bsize" blocks */
|
|
|
|
__u32 bavail; /* No. of available "bsize" blocks */
|
|
|
|
};
|
|
|
|
|
|
|
|
struct nfs_pathconf {
|
|
|
|
struct nfs_fattr *fattr; /* Post-op attributes */
|
|
|
|
__u32 max_link; /* max # of hard links */
|
|
|
|
__u32 max_namelen; /* max name length */
|
|
|
|
};
|
|
|
|
|
|
|
|
struct nfs4_change_info {
|
|
|
|
u32 atomic;
|
|
|
|
u64 before;
|
|
|
|
u64 after;
|
|
|
|
};
|
|
|
|
|
NFSv4: Add functions to order RPC calls
NFSv4 file state-changing functions such as OPEN, CLOSE, LOCK,... are all
labelled with "sequence identifiers" in order to prevent the server from
reordering RPC requests, as this could cause its file state to
become out of sync with the client.
Currently the NFS client code enforces this ordering locally using
semaphores to restrict access to structures until the RPC call is done.
This, of course, only works with synchronous RPC calls, since the
user process must first grab the semaphore.
By dropping semaphores, and instead teaching the RPC engine to hold
the RPC calls until they are ready to be sent, we can extend this
process to work nicely with asynchronous RPC calls too.
This patch adds a new list called "rpc_sequence" that defines the order
of the RPC calls to be sent. We add one such list for each state_owner.
When an RPC call is ready to be sent, it checks if it is top of the
rpc_sequence list. If so, it proceeds. If not, it goes back to sleep,
and loops until it hits top of the list.
Once the RPC call has completed, it can then bump the sequence id counter,
and remove itself from the rpc_sequence list, and then wake up the next
sleeper.
Note that the state_owner sequence ids and lock_owner sequence ids are
all indexed to the same rpc_sequence list, so OPEN, LOCK,... requests
are all ordered w.r.t. each other.
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
2005-10-18 15:20:12 -06:00
|
|
|
struct nfs_seqid;
|
2009-04-01 07:21:52 -06:00
|
|
|
|
2009-04-01 07:21:53 -06:00
|
|
|
/* nfs41 sessions channel attributes */
|
|
|
|
struct nfs4_channel_attrs {
|
|
|
|
u32 max_rqst_sz;
|
|
|
|
u32 max_resp_sz;
|
|
|
|
u32 max_resp_sz_cached;
|
|
|
|
u32 max_ops;
|
|
|
|
u32 max_reqs;
|
|
|
|
};
|
|
|
|
|
2012-11-26 12:20:49 -07:00
|
|
|
struct nfs4_slot;
|
2009-04-01 07:21:52 -06:00
|
|
|
struct nfs4_sequence_args {
|
2012-11-16 10:58:36 -07:00
|
|
|
struct nfs4_slot *sa_slot;
|
2012-10-29 17:02:20 -06:00
|
|
|
u8 sa_cache_this : 1,
|
|
|
|
sa_privileged : 1;
|
2009-04-01 07:21:52 -06:00
|
|
|
};
|
|
|
|
|
|
|
|
struct nfs4_sequence_res {
|
2010-09-24 07:17:01 -06:00
|
|
|
struct nfs4_slot *sr_slot; /* slot used to send request */
|
2012-12-15 13:21:52 -07:00
|
|
|
unsigned long sr_timestamp;
|
2009-04-01 07:22:15 -06:00
|
|
|
int sr_status; /* sequence operation status */
|
2009-12-05 11:46:14 -07:00
|
|
|
u32 sr_status_flags;
|
2012-11-20 16:10:30 -07:00
|
|
|
u32 sr_highest_slotid;
|
2012-11-20 10:49:27 -07:00
|
|
|
u32 sr_target_highest_slotid;
|
2009-04-01 07:21:52 -06:00
|
|
|
};
|
|
|
|
|
2009-04-01 07:22:30 -06:00
|
|
|
struct nfs4_get_lease_time_args {
|
|
|
|
struct nfs4_sequence_args la_seq_args;
|
|
|
|
};
|
|
|
|
|
|
|
|
struct nfs4_get_lease_time_res {
|
|
|
|
struct nfs4_sequence_res lr_seq_res;
|
2012-11-29 15:10:01 -07:00
|
|
|
struct nfs_fsinfo *lr_fsinfo;
|
2009-04-01 07:22:30 -06:00
|
|
|
};
|
|
|
|
|
2010-10-19 22:18:03 -06:00
|
|
|
#define PNFS_LAYOUT_MAXSIZE 4096
|
|
|
|
|
|
|
|
struct nfs4_layoutdriver_data {
|
2011-03-24 14:48:21 -06:00
|
|
|
struct page **pages;
|
|
|
|
__u32 pglen;
|
2010-10-19 22:18:03 -06:00
|
|
|
__u32 len;
|
|
|
|
};
|
|
|
|
|
|
|
|
struct pnfs_layout_range {
|
|
|
|
u32 iomode;
|
|
|
|
u64 offset;
|
|
|
|
u64 length;
|
|
|
|
};
|
|
|
|
|
|
|
|
struct nfs4_layoutget_args {
|
2012-11-29 15:10:01 -07:00
|
|
|
struct nfs4_sequence_args seq_args;
|
2010-10-19 22:18:03 -06:00
|
|
|
__u32 type;
|
|
|
|
struct pnfs_layout_range range;
|
|
|
|
__u64 minlength;
|
|
|
|
__u32 maxcount;
|
|
|
|
struct inode *inode;
|
|
|
|
struct nfs_open_context *ctx;
|
2011-01-06 04:36:25 -07:00
|
|
|
nfs4_stateid stateid;
|
2013-02-28 18:30:10 -07:00
|
|
|
unsigned long timestamp;
|
2011-03-24 14:48:21 -06:00
|
|
|
struct nfs4_layoutdriver_data layout;
|
2010-10-19 22:18:03 -06:00
|
|
|
};
|
|
|
|
|
|
|
|
struct nfs4_layoutget_res {
|
2012-11-29 15:10:01 -07:00
|
|
|
struct nfs4_sequence_res seq_res;
|
2010-10-19 22:18:03 -06:00
|
|
|
__u32 return_on_close;
|
|
|
|
struct pnfs_layout_range range;
|
|
|
|
__u32 type;
|
|
|
|
nfs4_stateid stateid;
|
2011-03-24 14:48:21 -06:00
|
|
|
struct nfs4_layoutdriver_data *layoutp;
|
2010-10-19 22:18:03 -06:00
|
|
|
};
|
|
|
|
|
|
|
|
struct nfs4_layoutget {
|
|
|
|
struct nfs4_layoutget_args args;
|
|
|
|
struct nfs4_layoutget_res res;
|
2013-05-20 08:49:34 -06:00
|
|
|
struct rpc_cred *cred;
|
2011-05-11 16:00:51 -06:00
|
|
|
gfp_t gfp_flags;
|
2010-10-19 22:18:03 -06:00
|
|
|
};
|
|
|
|
|
2011-07-30 18:52:35 -06:00
|
|
|
struct nfs4_getdevicelist_args {
|
2012-11-29 15:10:01 -07:00
|
|
|
struct nfs4_sequence_args seq_args;
|
2011-07-30 18:52:35 -06:00
|
|
|
const struct nfs_fh *fh;
|
|
|
|
u32 layoutclass;
|
|
|
|
};
|
|
|
|
|
|
|
|
struct nfs4_getdevicelist_res {
|
|
|
|
struct nfs4_sequence_res seq_res;
|
2012-11-29 15:10:01 -07:00
|
|
|
struct pnfs_devicelist *devlist;
|
2011-07-30 18:52:35 -06:00
|
|
|
};
|
|
|
|
|
2010-10-19 22:18:03 -06:00
|
|
|
struct nfs4_getdeviceinfo_args {
|
|
|
|
struct nfs4_sequence_args seq_args;
|
2012-11-29 15:10:01 -07:00
|
|
|
struct pnfs_device *pdev;
|
2010-10-19 22:18:03 -06:00
|
|
|
};
|
|
|
|
|
|
|
|
struct nfs4_getdeviceinfo_res {
|
|
|
|
struct nfs4_sequence_res seq_res;
|
2012-11-29 15:10:01 -07:00
|
|
|
struct pnfs_device *pdev;
|
2010-10-19 22:18:03 -06:00
|
|
|
};
|
|
|
|
|
2011-03-23 07:27:54 -06:00
|
|
|
struct nfs4_layoutcommit_args {
|
2012-11-29 15:10:01 -07:00
|
|
|
struct nfs4_sequence_args seq_args;
|
2011-03-23 07:27:54 -06:00
|
|
|
nfs4_stateid stateid;
|
|
|
|
__u64 lastbytewritten;
|
|
|
|
struct inode *inode;
|
|
|
|
const u32 *bitmask;
|
|
|
|
};
|
|
|
|
|
|
|
|
struct nfs4_layoutcommit_res {
|
2012-11-29 15:10:01 -07:00
|
|
|
struct nfs4_sequence_res seq_res;
|
2011-03-23 07:27:54 -06:00
|
|
|
struct nfs_fattr *fattr;
|
|
|
|
const struct nfs_server *server;
|
2011-07-30 18:52:38 -06:00
|
|
|
int status;
|
2011-03-23 07:27:54 -06:00
|
|
|
};
|
|
|
|
|
|
|
|
struct nfs4_layoutcommit_data {
|
|
|
|
struct rpc_task task;
|
|
|
|
struct nfs_fattr fattr;
|
2011-07-30 18:52:33 -06:00
|
|
|
struct list_head lseg_list;
|
2011-03-23 07:27:54 -06:00
|
|
|
struct rpc_cred *cred;
|
|
|
|
struct nfs4_layoutcommit_args args;
|
|
|
|
struct nfs4_layoutcommit_res res;
|
|
|
|
};
|
|
|
|
|
2011-05-22 10:52:37 -06:00
|
|
|
struct nfs4_layoutreturn_args {
|
2012-11-29 15:10:01 -07:00
|
|
|
struct nfs4_sequence_args seq_args;
|
2011-06-15 09:59:10 -06:00
|
|
|
struct pnfs_layout_hdr *layout;
|
2011-05-22 10:52:37 -06:00
|
|
|
struct inode *inode;
|
|
|
|
nfs4_stateid stateid;
|
2011-06-15 09:59:10 -06:00
|
|
|
__u32 layout_type;
|
2011-05-22 10:52:37 -06:00
|
|
|
};
|
|
|
|
|
|
|
|
struct nfs4_layoutreturn_res {
|
|
|
|
struct nfs4_sequence_res seq_res;
|
|
|
|
u32 lrs_present;
|
|
|
|
nfs4_stateid stateid;
|
|
|
|
};
|
|
|
|
|
|
|
|
struct nfs4_layoutreturn {
|
|
|
|
struct nfs4_layoutreturn_args args;
|
|
|
|
struct nfs4_layoutreturn_res res;
|
|
|
|
struct rpc_cred *cred;
|
|
|
|
struct nfs_client *clp;
|
|
|
|
int rpc_status;
|
|
|
|
};
|
|
|
|
|
2012-04-20 17:24:51 -06:00
|
|
|
struct stateowner_id {
|
|
|
|
__u64 create_time;
|
|
|
|
__u32 uniquifier;
|
|
|
|
};
|
|
|
|
|
2005-04-16 16:20:36 -06:00
|
|
|
/*
|
|
|
|
* Arguments to the open call.
|
|
|
|
*/
|
|
|
|
struct nfs_openargs {
|
2012-11-29 15:10:01 -07:00
|
|
|
struct nfs4_sequence_args seq_args;
|
2005-04-16 16:20:36 -06:00
|
|
|
const struct nfs_fh * fh;
|
NFSv4: Add functions to order RPC calls
NFSv4 file state-changing functions such as OPEN, CLOSE, LOCK,... are all
labelled with "sequence identifiers" in order to prevent the server from
reordering RPC requests, as this could cause its file state to
become out of sync with the client.
Currently the NFS client code enforces this ordering locally using
semaphores to restrict access to structures until the RPC call is done.
This, of course, only works with synchronous RPC calls, since the
user process must first grab the semaphore.
By dropping semaphores, and instead teaching the RPC engine to hold
the RPC calls until they are ready to be sent, we can extend this
process to work nicely with asynchronous RPC calls too.
This patch adds a new list called "rpc_sequence" that defines the order
of the RPC calls to be sent. We add one such list for each state_owner.
When an RPC call is ready to be sent, it checks if it is top of the
rpc_sequence list. If so, it proceeds. If not, it goes back to sleep,
and loops until it hits top of the list.
Once the RPC call has completed, it can then bump the sequence id counter,
and remove itself from the rpc_sequence list, and then wake up the next
sleeper.
Note that the state_owner sequence ids and lock_owner sequence ids are
all indexed to the same rpc_sequence list, so OPEN, LOCK,... requests
are all ordered w.r.t. each other.
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
2005-10-18 15:20:12 -06:00
|
|
|
struct nfs_seqid * seqid;
|
2005-04-16 16:20:36 -06:00
|
|
|
int open_flags;
|
2008-12-23 13:21:56 -07:00
|
|
|
fmode_t fmode;
|
2012-09-10 12:00:46 -06:00
|
|
|
u32 access;
|
2005-04-16 16:20:36 -06:00
|
|
|
__u64 clientid;
|
2012-04-20 17:24:51 -06:00
|
|
|
struct stateowner_id id;
|
2005-04-16 16:20:36 -06:00
|
|
|
union {
|
2010-06-16 07:52:27 -06:00
|
|
|
struct {
|
|
|
|
struct iattr * attrs; /* UNCHECKED, GUARDED */
|
|
|
|
nfs4_verifier verifier; /* EXCLUSIVE */
|
|
|
|
};
|
2005-04-16 16:20:36 -06:00
|
|
|
nfs4_stateid delegation; /* CLAIM_DELEGATE_CUR */
|
2008-12-23 13:21:53 -07:00
|
|
|
fmode_t delegation_type; /* CLAIM_PREVIOUS */
|
2005-04-16 16:20:36 -06:00
|
|
|
} u;
|
|
|
|
const struct qstr * name;
|
|
|
|
const struct nfs_server *server; /* Needed for ID mapping */
|
|
|
|
const u32 * bitmask;
|
2012-06-05 07:16:47 -06:00
|
|
|
const u32 * open_bitmap;
|
2005-04-16 16:20:36 -06:00
|
|
|
__u32 claim;
|
2013-04-16 16:42:34 -06:00
|
|
|
enum createmode4 createmode;
|
2013-05-22 10:50:40 -06:00
|
|
|
const struct nfs4_label *label;
|
2005-04-16 16:20:36 -06:00
|
|
|
};
|
|
|
|
|
|
|
|
struct nfs_openres {
|
2012-11-29 15:10:01 -07:00
|
|
|
struct nfs4_sequence_res seq_res;
|
2005-04-16 16:20:36 -06:00
|
|
|
nfs4_stateid stateid;
|
|
|
|
struct nfs_fh fh;
|
|
|
|
struct nfs4_change_info cinfo;
|
|
|
|
__u32 rflags;
|
|
|
|
struct nfs_fattr * f_attr;
|
2013-05-22 10:50:40 -06:00
|
|
|
struct nfs4_label *f_label;
|
2008-04-07 11:20:54 -06:00
|
|
|
struct nfs_seqid * seqid;
|
2005-04-16 16:20:36 -06:00
|
|
|
const struct nfs_server *server;
|
2008-12-23 13:21:53 -07:00
|
|
|
fmode_t delegation_type;
|
2005-04-16 16:20:36 -06:00
|
|
|
nfs4_stateid delegation;
|
|
|
|
__u32 do_recall;
|
|
|
|
__u64 maxsize;
|
2007-06-05 12:49:03 -06:00
|
|
|
__u32 attrset[NFS4_BITMAP_SIZE];
|
2012-01-07 11:22:46 -07:00
|
|
|
struct nfs4_string *owner;
|
|
|
|
struct nfs4_string *group_owner;
|
2012-10-02 15:49:52 -06:00
|
|
|
__u32 access_request;
|
2012-09-10 12:00:46 -06:00
|
|
|
__u32 access_supported;
|
|
|
|
__u32 access_result;
|
2005-04-16 16:20:36 -06:00
|
|
|
};
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Arguments to the open_confirm call.
|
|
|
|
*/
|
|
|
|
struct nfs_open_confirmargs {
|
2014-02-01 12:53:23 -07:00
|
|
|
struct nfs4_sequence_args seq_args;
|
2005-04-16 16:20:36 -06:00
|
|
|
const struct nfs_fh * fh;
|
2006-01-03 01:55:12 -07:00
|
|
|
nfs4_stateid * stateid;
|
NFSv4: Add functions to order RPC calls
NFSv4 file state-changing functions such as OPEN, CLOSE, LOCK,... are all
labelled with "sequence identifiers" in order to prevent the server from
reordering RPC requests, as this could cause its file state to
become out of sync with the client.
Currently the NFS client code enforces this ordering locally using
semaphores to restrict access to structures until the RPC call is done.
This, of course, only works with synchronous RPC calls, since the
user process must first grab the semaphore.
By dropping semaphores, and instead teaching the RPC engine to hold
the RPC calls until they are ready to be sent, we can extend this
process to work nicely with asynchronous RPC calls too.
This patch adds a new list called "rpc_sequence" that defines the order
of the RPC calls to be sent. We add one such list for each state_owner.
When an RPC call is ready to be sent, it checks if it is top of the
rpc_sequence list. If so, it proceeds. If not, it goes back to sleep,
and loops until it hits top of the list.
Once the RPC call has completed, it can then bump the sequence id counter,
and remove itself from the rpc_sequence list, and then wake up the next
sleeper.
Note that the state_owner sequence ids and lock_owner sequence ids are
all indexed to the same rpc_sequence list, so OPEN, LOCK,... requests
are all ordered w.r.t. each other.
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
2005-10-18 15:20:12 -06:00
|
|
|
struct nfs_seqid * seqid;
|
2005-04-16 16:20:36 -06:00
|
|
|
};
|
|
|
|
|
|
|
|
struct nfs_open_confirmres {
|
2014-02-01 12:53:23 -07:00
|
|
|
struct nfs4_sequence_res seq_res;
|
2005-04-16 16:20:36 -06:00
|
|
|
nfs4_stateid stateid;
|
2008-04-07 11:20:54 -06:00
|
|
|
struct nfs_seqid * seqid;
|
2005-04-16 16:20:36 -06:00
|
|
|
};
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Arguments to the close call.
|
|
|
|
*/
|
|
|
|
struct nfs_closeargs {
|
2012-11-29 15:10:01 -07:00
|
|
|
struct nfs4_sequence_args seq_args;
|
2005-04-16 16:20:36 -06:00
|
|
|
struct nfs_fh * fh;
|
2005-10-18 15:20:12 -06:00
|
|
|
nfs4_stateid * stateid;
|
NFSv4: Add functions to order RPC calls
NFSv4 file state-changing functions such as OPEN, CLOSE, LOCK,... are all
labelled with "sequence identifiers" in order to prevent the server from
reordering RPC requests, as this could cause its file state to
become out of sync with the client.
Currently the NFS client code enforces this ordering locally using
semaphores to restrict access to structures until the RPC call is done.
This, of course, only works with synchronous RPC calls, since the
user process must first grab the semaphore.
By dropping semaphores, and instead teaching the RPC engine to hold
the RPC calls until they are ready to be sent, we can extend this
process to work nicely with asynchronous RPC calls too.
This patch adds a new list called "rpc_sequence" that defines the order
of the RPC calls to be sent. We add one such list for each state_owner.
When an RPC call is ready to be sent, it checks if it is top of the
rpc_sequence list. If so, it proceeds. If not, it goes back to sleep,
and loops until it hits top of the list.
Once the RPC call has completed, it can then bump the sequence id counter,
and remove itself from the rpc_sequence list, and then wake up the next
sleeper.
Note that the state_owner sequence ids and lock_owner sequence ids are
all indexed to the same rpc_sequence list, so OPEN, LOCK,... requests
are all ordered w.r.t. each other.
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
2005-10-18 15:20:12 -06:00
|
|
|
struct nfs_seqid * seqid;
|
2008-12-23 13:21:56 -07:00
|
|
|
fmode_t fmode;
|
2005-10-27 20:12:41 -06:00
|
|
|
const u32 * bitmask;
|
2005-04-16 16:20:36 -06:00
|
|
|
};
|
|
|
|
|
|
|
|
struct nfs_closeres {
|
2012-11-29 15:10:01 -07:00
|
|
|
struct nfs4_sequence_res seq_res;
|
2005-04-16 16:20:36 -06:00
|
|
|
nfs4_stateid stateid;
|
2005-10-27 20:12:41 -06:00
|
|
|
struct nfs_fattr * fattr;
|
2008-04-07 11:20:54 -06:00
|
|
|
struct nfs_seqid * seqid;
|
2005-10-27 20:12:41 -06:00
|
|
|
const struct nfs_server *server;
|
2005-04-16 16:20:36 -06:00
|
|
|
};
|
|
|
|
/*
|
|
|
|
* * Arguments to the lock,lockt, and locku call.
|
|
|
|
* */
|
|
|
|
struct nfs_lowner {
|
2006-01-03 01:55:16 -07:00
|
|
|
__u64 clientid;
|
2007-07-02 11:58:33 -06:00
|
|
|
__u64 id;
|
2010-12-21 08:45:27 -07:00
|
|
|
dev_t s_dev;
|
2005-04-16 16:20:36 -06:00
|
|
|
};
|
|
|
|
|
2006-01-03 01:55:16 -07:00
|
|
|
struct nfs_lock_args {
|
2012-11-29 15:10:01 -07:00
|
|
|
struct nfs4_sequence_args seq_args;
|
2006-01-03 01:55:16 -07:00
|
|
|
struct nfs_fh * fh;
|
|
|
|
struct file_lock * fl;
|
NFSv4: Add functions to order RPC calls
NFSv4 file state-changing functions such as OPEN, CLOSE, LOCK,... are all
labelled with "sequence identifiers" in order to prevent the server from
reordering RPC requests, as this could cause its file state to
become out of sync with the client.
Currently the NFS client code enforces this ordering locally using
semaphores to restrict access to structures until the RPC call is done.
This, of course, only works with synchronous RPC calls, since the
user process must first grab the semaphore.
By dropping semaphores, and instead teaching the RPC engine to hold
the RPC calls until they are ready to be sent, we can extend this
process to work nicely with asynchronous RPC calls too.
This patch adds a new list called "rpc_sequence" that defines the order
of the RPC calls to be sent. We add one such list for each state_owner.
When an RPC call is ready to be sent, it checks if it is top of the
rpc_sequence list. If so, it proceeds. If not, it goes back to sleep,
and loops until it hits top of the list.
Once the RPC call has completed, it can then bump the sequence id counter,
and remove itself from the rpc_sequence list, and then wake up the next
sleeper.
Note that the state_owner sequence ids and lock_owner sequence ids are
all indexed to the same rpc_sequence list, so OPEN, LOCK,... requests
are all ordered w.r.t. each other.
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
2005-10-18 15:20:12 -06:00
|
|
|
struct nfs_seqid * lock_seqid;
|
2005-10-18 15:20:15 -06:00
|
|
|
nfs4_stateid * lock_stateid;
|
|
|
|
struct nfs_seqid * open_seqid;
|
|
|
|
nfs4_stateid * open_stateid;
|
2006-01-03 01:55:16 -07:00
|
|
|
struct nfs_lowner lock_owner;
|
|
|
|
unsigned char block : 1;
|
|
|
|
unsigned char reclaim : 1;
|
|
|
|
unsigned char new_lock_owner : 1;
|
|
|
|
};
|
|
|
|
|
|
|
|
struct nfs_lock_res {
|
2012-11-29 15:10:01 -07:00
|
|
|
struct nfs4_sequence_res seq_res;
|
2008-04-07 11:20:54 -06:00
|
|
|
nfs4_stateid stateid;
|
|
|
|
struct nfs_seqid * lock_seqid;
|
|
|
|
struct nfs_seqid * open_seqid;
|
2005-04-16 16:20:36 -06:00
|
|
|
};
|
|
|
|
|
2006-01-03 01:55:16 -07:00
|
|
|
struct nfs_locku_args {
|
2012-11-29 15:10:01 -07:00
|
|
|
struct nfs4_sequence_args seq_args;
|
2006-01-03 01:55:16 -07:00
|
|
|
struct nfs_fh * fh;
|
|
|
|
struct file_lock * fl;
|
NFSv4: Add functions to order RPC calls
NFSv4 file state-changing functions such as OPEN, CLOSE, LOCK,... are all
labelled with "sequence identifiers" in order to prevent the server from
reordering RPC requests, as this could cause its file state to
become out of sync with the client.
Currently the NFS client code enforces this ordering locally using
semaphores to restrict access to structures until the RPC call is done.
This, of course, only works with synchronous RPC calls, since the
user process must first grab the semaphore.
By dropping semaphores, and instead teaching the RPC engine to hold
the RPC calls until they are ready to be sent, we can extend this
process to work nicely with asynchronous RPC calls too.
This patch adds a new list called "rpc_sequence" that defines the order
of the RPC calls to be sent. We add one such list for each state_owner.
When an RPC call is ready to be sent, it checks if it is top of the
rpc_sequence list. If so, it proceeds. If not, it goes back to sleep,
and loops until it hits top of the list.
Once the RPC call has completed, it can then bump the sequence id counter,
and remove itself from the rpc_sequence list, and then wake up the next
sleeper.
Note that the state_owner sequence ids and lock_owner sequence ids are
all indexed to the same rpc_sequence list, so OPEN, LOCK,... requests
are all ordered w.r.t. each other.
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
2005-10-18 15:20:12 -06:00
|
|
|
struct nfs_seqid * seqid;
|
2005-10-18 15:20:15 -06:00
|
|
|
nfs4_stateid * stateid;
|
2005-04-16 16:20:36 -06:00
|
|
|
};
|
|
|
|
|
2006-01-03 01:55:16 -07:00
|
|
|
struct nfs_locku_res {
|
2012-11-29 15:10:01 -07:00
|
|
|
struct nfs4_sequence_res seq_res;
|
2008-04-07 11:20:54 -06:00
|
|
|
nfs4_stateid stateid;
|
|
|
|
struct nfs_seqid * seqid;
|
2005-04-16 16:20:36 -06:00
|
|
|
};
|
|
|
|
|
2006-01-03 01:55:16 -07:00
|
|
|
struct nfs_lockt_args {
|
2012-11-29 15:10:01 -07:00
|
|
|
struct nfs4_sequence_args seq_args;
|
2006-01-03 01:55:16 -07:00
|
|
|
struct nfs_fh * fh;
|
|
|
|
struct file_lock * fl;
|
|
|
|
struct nfs_lowner lock_owner;
|
2005-04-16 16:20:36 -06:00
|
|
|
};
|
|
|
|
|
2006-01-03 01:55:16 -07:00
|
|
|
struct nfs_lockt_res {
|
2009-04-01 07:21:52 -06:00
|
|
|
struct nfs4_sequence_res seq_res;
|
2012-11-29 15:10:01 -07:00
|
|
|
struct file_lock * denied; /* LOCK, LOCKT failed */
|
2005-04-16 16:20:36 -06:00
|
|
|
};
|
|
|
|
|
2010-07-01 10:49:01 -06:00
|
|
|
struct nfs_release_lockowner_args {
|
2014-02-26 12:19:14 -07:00
|
|
|
struct nfs4_sequence_args seq_args;
|
2010-07-01 10:49:01 -06:00
|
|
|
struct nfs_lowner lock_owner;
|
|
|
|
};
|
|
|
|
|
2014-02-26 12:19:14 -07:00
|
|
|
struct nfs_release_lockowner_res {
|
|
|
|
struct nfs4_sequence_res seq_res;
|
|
|
|
};
|
|
|
|
|
2005-04-16 16:20:36 -06:00
|
|
|
struct nfs4_delegreturnargs {
|
2012-11-29 15:10:01 -07:00
|
|
|
struct nfs4_sequence_args seq_args;
|
2005-04-16 16:20:36 -06:00
|
|
|
const struct nfs_fh *fhandle;
|
|
|
|
const nfs4_stateid *stateid;
|
2006-01-03 01:55:38 -07:00
|
|
|
const u32 * bitmask;
|
|
|
|
};
|
|
|
|
|
|
|
|
struct nfs4_delegreturnres {
|
2012-11-29 15:10:01 -07:00
|
|
|
struct nfs4_sequence_res seq_res;
|
2006-01-03 01:55:38 -07:00
|
|
|
struct nfs_fattr * fattr;
|
|
|
|
const struct nfs_server *server;
|
2005-04-16 16:20:36 -06:00
|
|
|
};
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Arguments to the read call.
|
|
|
|
*/
|
|
|
|
struct nfs_readargs {
|
2012-11-29 15:10:01 -07:00
|
|
|
struct nfs4_sequence_args seq_args;
|
2005-04-16 16:20:36 -06:00
|
|
|
struct nfs_fh * fh;
|
|
|
|
struct nfs_open_context *context;
|
2010-06-25 14:35:53 -06:00
|
|
|
struct nfs_lock_context *lock_context;
|
2013-03-17 13:52:00 -06:00
|
|
|
nfs4_stateid stateid;
|
2005-04-16 16:20:36 -06:00
|
|
|
__u64 offset;
|
|
|
|
__u32 count;
|
|
|
|
unsigned int pgbase;
|
|
|
|
struct page ** pages;
|
|
|
|
};
|
|
|
|
|
|
|
|
struct nfs_readres {
|
2012-11-29 15:10:01 -07:00
|
|
|
struct nfs4_sequence_res seq_res;
|
2005-04-16 16:20:36 -06:00
|
|
|
struct nfs_fattr * fattr;
|
|
|
|
__u32 count;
|
|
|
|
int eof;
|
|
|
|
};
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Arguments to the write call.
|
|
|
|
*/
|
|
|
|
struct nfs_writeargs {
|
2012-11-29 15:10:01 -07:00
|
|
|
struct nfs4_sequence_args seq_args;
|
2005-04-16 16:20:36 -06:00
|
|
|
struct nfs_fh * fh;
|
|
|
|
struct nfs_open_context *context;
|
2010-06-25 14:35:53 -06:00
|
|
|
struct nfs_lock_context *lock_context;
|
2013-03-17 13:52:00 -06:00
|
|
|
nfs4_stateid stateid;
|
2005-04-16 16:20:36 -06:00
|
|
|
__u64 offset;
|
|
|
|
__u32 count;
|
|
|
|
enum nfs3_stable_how stable;
|
|
|
|
unsigned int pgbase;
|
|
|
|
struct page ** pages;
|
2005-10-27 20:12:44 -06:00
|
|
|
const u32 * bitmask;
|
2005-04-16 16:20:36 -06:00
|
|
|
};
|
|
|
|
|
2012-06-08 09:56:09 -06:00
|
|
|
struct nfs_write_verifier {
|
|
|
|
char data[8];
|
|
|
|
};
|
|
|
|
|
2005-04-16 16:20:36 -06:00
|
|
|
struct nfs_writeverf {
|
2012-06-08 09:56:09 -06:00
|
|
|
struct nfs_write_verifier verifier;
|
2005-04-16 16:20:36 -06:00
|
|
|
enum nfs3_stable_how committed;
|
|
|
|
};
|
|
|
|
|
|
|
|
struct nfs_writeres {
|
2012-11-29 15:10:01 -07:00
|
|
|
struct nfs4_sequence_res seq_res;
|
2005-04-16 16:20:36 -06:00
|
|
|
struct nfs_fattr * fattr;
|
|
|
|
struct nfs_writeverf * verf;
|
|
|
|
__u32 count;
|
2005-10-27 20:12:44 -06:00
|
|
|
const struct nfs_server *server;
|
2005-04-16 16:20:36 -06:00
|
|
|
};
|
|
|
|
|
2012-04-20 12:47:39 -06:00
|
|
|
/*
|
|
|
|
* Arguments to the commit call.
|
|
|
|
*/
|
|
|
|
struct nfs_commitargs {
|
2012-11-29 15:10:01 -07:00
|
|
|
struct nfs4_sequence_args seq_args;
|
2012-04-20 12:47:39 -06:00
|
|
|
struct nfs_fh *fh;
|
|
|
|
__u64 offset;
|
|
|
|
__u32 count;
|
|
|
|
const u32 *bitmask;
|
|
|
|
};
|
|
|
|
|
|
|
|
struct nfs_commitres {
|
2012-11-29 15:10:01 -07:00
|
|
|
struct nfs4_sequence_res seq_res;
|
2012-04-20 12:47:39 -06:00
|
|
|
struct nfs_fattr *fattr;
|
|
|
|
struct nfs_writeverf *verf;
|
|
|
|
const struct nfs_server *server;
|
|
|
|
};
|
|
|
|
|
2007-07-14 13:39:57 -06:00
|
|
|
/*
|
|
|
|
* Common arguments to the unlink call
|
|
|
|
*/
|
|
|
|
struct nfs_removeargs {
|
2012-11-29 15:10:01 -07:00
|
|
|
struct nfs4_sequence_args seq_args;
|
2007-07-14 13:39:57 -06:00
|
|
|
const struct nfs_fh *fh;
|
|
|
|
struct qstr name;
|
|
|
|
};
|
|
|
|
|
|
|
|
struct nfs_removeres {
|
2012-11-29 15:10:01 -07:00
|
|
|
struct nfs4_sequence_res seq_res;
|
2007-07-14 13:39:57 -06:00
|
|
|
const struct nfs_server *server;
|
2010-04-16 14:22:50 -06:00
|
|
|
struct nfs_fattr *dir_attr;
|
2007-07-14 13:39:57 -06:00
|
|
|
struct nfs4_change_info cinfo;
|
|
|
|
};
|
|
|
|
|
2010-09-17 15:30:25 -06:00
|
|
|
/*
|
|
|
|
* Common arguments to the rename call
|
|
|
|
*/
|
|
|
|
struct nfs_renameargs {
|
2012-11-29 15:10:01 -07:00
|
|
|
struct nfs4_sequence_args seq_args;
|
2010-09-17 15:30:25 -06:00
|
|
|
const struct nfs_fh *old_dir;
|
|
|
|
const struct nfs_fh *new_dir;
|
|
|
|
const struct qstr *old_name;
|
|
|
|
const struct qstr *new_name;
|
|
|
|
};
|
|
|
|
|
2010-09-17 15:31:06 -06:00
|
|
|
struct nfs_renameres {
|
2012-11-29 15:10:01 -07:00
|
|
|
struct nfs4_sequence_res seq_res;
|
2010-09-17 15:31:06 -06:00
|
|
|
const struct nfs_server *server;
|
|
|
|
struct nfs4_change_info old_cinfo;
|
|
|
|
struct nfs_fattr *old_fattr;
|
|
|
|
struct nfs4_change_info new_cinfo;
|
|
|
|
struct nfs_fattr *new_fattr;
|
|
|
|
};
|
|
|
|
|
2013-10-18 13:15:16 -06:00
|
|
|
/* parsed sec= options */
|
2013-10-18 13:15:19 -06:00
|
|
|
#define NFS_AUTH_INFO_MAX_FLAVORS 12 /* see fs/nfs/super.c */
|
2013-10-18 13:15:16 -06:00
|
|
|
struct nfs_auth_info {
|
|
|
|
unsigned int flavor_len;
|
2013-10-18 13:15:19 -06:00
|
|
|
rpc_authflavor_t flavors[NFS_AUTH_INFO_MAX_FLAVORS];
|
2013-10-18 13:15:16 -06:00
|
|
|
};
|
|
|
|
|
2005-04-16 16:20:36 -06:00
|
|
|
/*
|
|
|
|
* Argument struct for decode_entry function
|
|
|
|
*/
|
|
|
|
struct nfs_entry {
|
|
|
|
__u64 ino;
|
|
|
|
__u64 cookie,
|
|
|
|
prev_cookie;
|
|
|
|
const char * name;
|
|
|
|
unsigned int len;
|
|
|
|
int eof;
|
|
|
|
struct nfs_fh * fh;
|
|
|
|
struct nfs_fattr * fattr;
|
2013-05-22 10:50:40 -06:00
|
|
|
struct nfs4_label *label;
|
2010-11-20 12:26:44 -07:00
|
|
|
unsigned char d_type;
|
2010-12-14 07:58:11 -07:00
|
|
|
struct nfs_server * server;
|
2005-04-16 16:20:36 -06:00
|
|
|
};
|
|
|
|
|
|
|
|
/*
|
|
|
|
* The following types are for NFSv2 only.
|
|
|
|
*/
|
|
|
|
struct nfs_sattrargs {
|
|
|
|
struct nfs_fh * fh;
|
|
|
|
struct iattr * sattr;
|
|
|
|
};
|
|
|
|
|
|
|
|
struct nfs_diropargs {
|
|
|
|
struct nfs_fh * fh;
|
|
|
|
const char * name;
|
|
|
|
unsigned int len;
|
|
|
|
};
|
|
|
|
|
|
|
|
struct nfs_createargs {
|
|
|
|
struct nfs_fh * fh;
|
|
|
|
const char * name;
|
|
|
|
unsigned int len;
|
|
|
|
struct iattr * sattr;
|
|
|
|
};
|
|
|
|
|
|
|
|
struct nfs_setattrargs {
|
2012-11-29 15:10:01 -07:00
|
|
|
struct nfs4_sequence_args seq_args;
|
2005-04-16 16:20:36 -06:00
|
|
|
struct nfs_fh * fh;
|
|
|
|
nfs4_stateid stateid;
|
|
|
|
struct iattr * iap;
|
|
|
|
const struct nfs_server * server; /* Needed for name mapping */
|
|
|
|
const u32 * bitmask;
|
2013-05-22 10:50:40 -06:00
|
|
|
const struct nfs4_label *label;
|
2005-04-16 16:20:36 -06:00
|
|
|
};
|
|
|
|
|
2005-06-22 11:16:22 -06:00
|
|
|
struct nfs_setaclargs {
|
2012-11-29 15:10:01 -07:00
|
|
|
struct nfs4_sequence_args seq_args;
|
2005-06-22 11:16:22 -06:00
|
|
|
struct nfs_fh * fh;
|
|
|
|
size_t acl_len;
|
|
|
|
unsigned int acl_pgbase;
|
|
|
|
struct page ** acl_pages;
|
|
|
|
};
|
|
|
|
|
2009-04-01 07:22:01 -06:00
|
|
|
struct nfs_setaclres {
|
|
|
|
struct nfs4_sequence_res seq_res;
|
|
|
|
};
|
|
|
|
|
2005-06-22 11:16:22 -06:00
|
|
|
struct nfs_getaclargs {
|
2012-11-29 15:10:01 -07:00
|
|
|
struct nfs4_sequence_args seq_args;
|
2005-06-22 11:16:22 -06:00
|
|
|
struct nfs_fh * fh;
|
|
|
|
size_t acl_len;
|
|
|
|
unsigned int acl_pgbase;
|
|
|
|
struct page ** acl_pages;
|
|
|
|
};
|
|
|
|
|
2011-12-07 09:55:27 -07:00
|
|
|
/* getxattr ACL interface flags */
|
2012-08-26 12:44:43 -06:00
|
|
|
#define NFS4_ACL_TRUNC 0x0001 /* ACL was truncated */
|
2009-04-01 07:21:59 -06:00
|
|
|
struct nfs_getaclres {
|
2012-11-29 15:10:01 -07:00
|
|
|
struct nfs4_sequence_res seq_res;
|
2009-04-01 07:21:59 -06:00
|
|
|
size_t acl_len;
|
2011-12-07 09:55:27 -07:00
|
|
|
size_t acl_data_offset;
|
|
|
|
int acl_flags;
|
2012-02-03 16:30:53 -07:00
|
|
|
struct page * acl_scratch;
|
2009-04-01 07:21:59 -06:00
|
|
|
};
|
|
|
|
|
2005-04-16 16:20:36 -06:00
|
|
|
struct nfs_setattrres {
|
2012-11-29 15:10:01 -07:00
|
|
|
struct nfs4_sequence_res seq_res;
|
2005-04-16 16:20:36 -06:00
|
|
|
struct nfs_fattr * fattr;
|
2013-05-22 10:50:40 -06:00
|
|
|
struct nfs4_label *label;
|
2005-04-16 16:20:36 -06:00
|
|
|
const struct nfs_server * server;
|
|
|
|
};
|
|
|
|
|
|
|
|
struct nfs_linkargs {
|
|
|
|
struct nfs_fh * fromfh;
|
|
|
|
struct nfs_fh * tofh;
|
|
|
|
const char * toname;
|
|
|
|
unsigned int tolen;
|
|
|
|
};
|
|
|
|
|
|
|
|
struct nfs_symlinkargs {
|
|
|
|
struct nfs_fh * fromfh;
|
|
|
|
const char * fromname;
|
|
|
|
unsigned int fromlen;
|
2006-08-22 18:06:23 -06:00
|
|
|
struct page ** pages;
|
|
|
|
unsigned int pathlen;
|
2005-04-16 16:20:36 -06:00
|
|
|
struct iattr * sattr;
|
|
|
|
};
|
|
|
|
|
|
|
|
struct nfs_readdirargs {
|
|
|
|
struct nfs_fh * fh;
|
|
|
|
__u32 cookie;
|
|
|
|
unsigned int count;
|
|
|
|
struct page ** pages;
|
|
|
|
};
|
|
|
|
|
2005-06-22 11:16:27 -06:00
|
|
|
struct nfs3_getaclargs {
|
|
|
|
struct nfs_fh * fh;
|
|
|
|
int mask;
|
|
|
|
struct page ** pages;
|
|
|
|
};
|
|
|
|
|
|
|
|
struct nfs3_setaclargs {
|
|
|
|
struct inode * inode;
|
|
|
|
int mask;
|
|
|
|
struct posix_acl * acl_access;
|
|
|
|
struct posix_acl * acl_default;
|
2009-03-10 18:33:18 -06:00
|
|
|
size_t len;
|
|
|
|
unsigned int npages;
|
2005-06-22 11:16:27 -06:00
|
|
|
struct page ** pages;
|
|
|
|
};
|
|
|
|
|
2005-04-16 16:20:36 -06:00
|
|
|
struct nfs_diropok {
|
|
|
|
struct nfs_fh * fh;
|
|
|
|
struct nfs_fattr * fattr;
|
|
|
|
};
|
|
|
|
|
|
|
|
struct nfs_readlinkargs {
|
|
|
|
struct nfs_fh * fh;
|
|
|
|
unsigned int pgbase;
|
|
|
|
unsigned int pglen;
|
|
|
|
struct page ** pages;
|
|
|
|
};
|
|
|
|
|
|
|
|
struct nfs3_sattrargs {
|
|
|
|
struct nfs_fh * fh;
|
|
|
|
struct iattr * sattr;
|
|
|
|
unsigned int guard;
|
|
|
|
struct timespec guardtime;
|
|
|
|
};
|
|
|
|
|
|
|
|
struct nfs3_diropargs {
|
|
|
|
struct nfs_fh * fh;
|
|
|
|
const char * name;
|
|
|
|
unsigned int len;
|
|
|
|
};
|
|
|
|
|
|
|
|
struct nfs3_accessargs {
|
|
|
|
struct nfs_fh * fh;
|
|
|
|
__u32 access;
|
|
|
|
};
|
|
|
|
|
|
|
|
struct nfs3_createargs {
|
|
|
|
struct nfs_fh * fh;
|
|
|
|
const char * name;
|
|
|
|
unsigned int len;
|
|
|
|
struct iattr * sattr;
|
|
|
|
enum nfs3_createmode createmode;
|
2006-10-20 00:28:51 -06:00
|
|
|
__be32 verifier[2];
|
2005-04-16 16:20:36 -06:00
|
|
|
};
|
|
|
|
|
|
|
|
struct nfs3_mkdirargs {
|
|
|
|
struct nfs_fh * fh;
|
|
|
|
const char * name;
|
|
|
|
unsigned int len;
|
|
|
|
struct iattr * sattr;
|
|
|
|
};
|
|
|
|
|
|
|
|
struct nfs3_symlinkargs {
|
|
|
|
struct nfs_fh * fromfh;
|
|
|
|
const char * fromname;
|
|
|
|
unsigned int fromlen;
|
2006-08-22 18:06:23 -06:00
|
|
|
struct page ** pages;
|
|
|
|
unsigned int pathlen;
|
2005-04-16 16:20:36 -06:00
|
|
|
struct iattr * sattr;
|
|
|
|
};
|
|
|
|
|
|
|
|
struct nfs3_mknodargs {
|
|
|
|
struct nfs_fh * fh;
|
|
|
|
const char * name;
|
|
|
|
unsigned int len;
|
|
|
|
enum nfs3_ftype type;
|
|
|
|
struct iattr * sattr;
|
|
|
|
dev_t rdev;
|
|
|
|
};
|
|
|
|
|
|
|
|
struct nfs3_linkargs {
|
|
|
|
struct nfs_fh * fromfh;
|
|
|
|
struct nfs_fh * tofh;
|
|
|
|
const char * toname;
|
|
|
|
unsigned int tolen;
|
|
|
|
};
|
|
|
|
|
|
|
|
struct nfs3_readdirargs {
|
|
|
|
struct nfs_fh * fh;
|
|
|
|
__u64 cookie;
|
2006-10-20 00:28:51 -06:00
|
|
|
__be32 verf[2];
|
2005-04-16 16:20:36 -06:00
|
|
|
int plus;
|
|
|
|
unsigned int count;
|
|
|
|
struct page ** pages;
|
|
|
|
};
|
|
|
|
|
|
|
|
struct nfs3_diropres {
|
|
|
|
struct nfs_fattr * dir_attr;
|
|
|
|
struct nfs_fh * fh;
|
|
|
|
struct nfs_fattr * fattr;
|
|
|
|
};
|
|
|
|
|
|
|
|
struct nfs3_accessres {
|
|
|
|
struct nfs_fattr * fattr;
|
|
|
|
__u32 access;
|
|
|
|
};
|
|
|
|
|
|
|
|
struct nfs3_readlinkargs {
|
|
|
|
struct nfs_fh * fh;
|
|
|
|
unsigned int pgbase;
|
|
|
|
unsigned int pglen;
|
|
|
|
struct page ** pages;
|
|
|
|
};
|
|
|
|
|
|
|
|
struct nfs3_linkres {
|
|
|
|
struct nfs_fattr * dir_attr;
|
|
|
|
struct nfs_fattr * fattr;
|
|
|
|
};
|
|
|
|
|
|
|
|
struct nfs3_readdirres {
|
|
|
|
struct nfs_fattr * dir_attr;
|
2006-10-20 00:28:51 -06:00
|
|
|
__be32 * verf;
|
2005-04-16 16:20:36 -06:00
|
|
|
int plus;
|
|
|
|
};
|
|
|
|
|
2005-06-22 11:16:27 -06:00
|
|
|
struct nfs3_getaclres {
|
|
|
|
struct nfs_fattr * fattr;
|
|
|
|
int mask;
|
|
|
|
unsigned int acl_access_count;
|
|
|
|
unsigned int acl_default_count;
|
|
|
|
struct posix_acl * acl_access;
|
|
|
|
struct posix_acl * acl_default;
|
|
|
|
};
|
|
|
|
|
2012-07-30 14:05:25 -06:00
|
|
|
#if IS_ENABLED(CONFIG_NFS_V4)
|
2005-04-16 16:20:36 -06:00
|
|
|
|
|
|
|
typedef u64 clientid4;
|
|
|
|
|
|
|
|
struct nfs4_accessargs {
|
2012-11-29 15:10:01 -07:00
|
|
|
struct nfs4_sequence_args seq_args;
|
2005-04-16 16:20:36 -06:00
|
|
|
const struct nfs_fh * fh;
|
2007-08-10 15:45:11 -06:00
|
|
|
const u32 * bitmask;
|
2005-04-16 16:20:36 -06:00
|
|
|
u32 access;
|
|
|
|
};
|
|
|
|
|
|
|
|
struct nfs4_accessres {
|
2012-11-29 15:10:01 -07:00
|
|
|
struct nfs4_sequence_res seq_res;
|
2007-08-10 15:45:11 -06:00
|
|
|
const struct nfs_server * server;
|
|
|
|
struct nfs_fattr * fattr;
|
2005-04-16 16:20:36 -06:00
|
|
|
u32 supported;
|
|
|
|
u32 access;
|
|
|
|
};
|
|
|
|
|
|
|
|
struct nfs4_create_arg {
|
2012-11-29 15:10:01 -07:00
|
|
|
struct nfs4_sequence_args seq_args;
|
2005-04-16 16:20:36 -06:00
|
|
|
u32 ftype;
|
|
|
|
union {
|
2006-08-22 18:06:23 -06:00
|
|
|
struct {
|
|
|
|
struct page ** pages;
|
|
|
|
unsigned int len;
|
|
|
|
} symlink; /* NF4LNK */
|
2005-04-16 16:20:36 -06:00
|
|
|
struct {
|
|
|
|
u32 specdata1;
|
|
|
|
u32 specdata2;
|
|
|
|
} device; /* NF4BLK, NF4CHR */
|
|
|
|
} u;
|
|
|
|
const struct qstr * name;
|
|
|
|
const struct nfs_server * server;
|
|
|
|
const struct iattr * attrs;
|
|
|
|
const struct nfs_fh * dir_fh;
|
|
|
|
const u32 * bitmask;
|
2013-05-22 10:50:40 -06:00
|
|
|
const struct nfs4_label *label;
|
2005-04-16 16:20:36 -06:00
|
|
|
};
|
|
|
|
|
|
|
|
struct nfs4_create_res {
|
2012-11-29 15:10:01 -07:00
|
|
|
struct nfs4_sequence_res seq_res;
|
2005-04-16 16:20:36 -06:00
|
|
|
const struct nfs_server * server;
|
|
|
|
struct nfs_fh * fh;
|
|
|
|
struct nfs_fattr * fattr;
|
2013-05-22 10:50:40 -06:00
|
|
|
struct nfs4_label *label;
|
2005-04-16 16:20:36 -06:00
|
|
|
struct nfs4_change_info dir_cinfo;
|
|
|
|
};
|
|
|
|
|
|
|
|
struct nfs4_fsinfo_arg {
|
2012-11-29 15:10:01 -07:00
|
|
|
struct nfs4_sequence_args seq_args;
|
2005-04-16 16:20:36 -06:00
|
|
|
const struct nfs_fh * fh;
|
|
|
|
const u32 * bitmask;
|
|
|
|
};
|
|
|
|
|
2009-04-01 07:21:57 -06:00
|
|
|
struct nfs4_fsinfo_res {
|
|
|
|
struct nfs4_sequence_res seq_res;
|
2012-11-29 15:10:01 -07:00
|
|
|
struct nfs_fsinfo *fsinfo;
|
2009-04-01 07:21:57 -06:00
|
|
|
};
|
|
|
|
|
2005-04-16 16:20:36 -06:00
|
|
|
struct nfs4_getattr_arg {
|
2012-11-29 15:10:01 -07:00
|
|
|
struct nfs4_sequence_args seq_args;
|
2005-04-16 16:20:36 -06:00
|
|
|
const struct nfs_fh * fh;
|
|
|
|
const u32 * bitmask;
|
|
|
|
};
|
|
|
|
|
|
|
|
struct nfs4_getattr_res {
|
2012-11-29 15:10:01 -07:00
|
|
|
struct nfs4_sequence_res seq_res;
|
2005-04-16 16:20:36 -06:00
|
|
|
const struct nfs_server * server;
|
|
|
|
struct nfs_fattr * fattr;
|
2013-05-22 10:50:40 -06:00
|
|
|
struct nfs4_label *label;
|
2005-04-16 16:20:36 -06:00
|
|
|
};
|
|
|
|
|
|
|
|
struct nfs4_link_arg {
|
2012-11-29 15:10:01 -07:00
|
|
|
struct nfs4_sequence_args seq_args;
|
2005-04-16 16:20:36 -06:00
|
|
|
const struct nfs_fh * fh;
|
|
|
|
const struct nfs_fh * dir_fh;
|
|
|
|
const struct qstr * name;
|
2005-10-27 20:12:42 -06:00
|
|
|
const u32 * bitmask;
|
|
|
|
};
|
|
|
|
|
|
|
|
struct nfs4_link_res {
|
2012-11-29 15:10:01 -07:00
|
|
|
struct nfs4_sequence_res seq_res;
|
2005-10-27 20:12:42 -06:00
|
|
|
const struct nfs_server * server;
|
|
|
|
struct nfs_fattr * fattr;
|
2013-05-22 10:50:40 -06:00
|
|
|
struct nfs4_label *label;
|
2005-10-27 20:12:42 -06:00
|
|
|
struct nfs4_change_info cinfo;
|
|
|
|
struct nfs_fattr * dir_attr;
|
2005-04-16 16:20:36 -06:00
|
|
|
};
|
|
|
|
|
2005-10-27 20:12:42 -06:00
|
|
|
|
2005-04-16 16:20:36 -06:00
|
|
|
struct nfs4_lookup_arg {
|
2012-11-29 15:10:01 -07:00
|
|
|
struct nfs4_sequence_args seq_args;
|
2005-04-16 16:20:36 -06:00
|
|
|
const struct nfs_fh * dir_fh;
|
|
|
|
const struct qstr * name;
|
|
|
|
const u32 * bitmask;
|
|
|
|
};
|
|
|
|
|
|
|
|
struct nfs4_lookup_res {
|
2012-11-29 15:10:01 -07:00
|
|
|
struct nfs4_sequence_res seq_res;
|
2005-04-16 16:20:36 -06:00
|
|
|
const struct nfs_server * server;
|
|
|
|
struct nfs_fattr * fattr;
|
|
|
|
struct nfs_fh * fh;
|
2013-05-22 10:50:40 -06:00
|
|
|
struct nfs4_label *label;
|
2005-04-16 16:20:36 -06:00
|
|
|
};
|
|
|
|
|
|
|
|
struct nfs4_lookup_root_arg {
|
2009-04-01 07:21:52 -06:00
|
|
|
struct nfs4_sequence_args seq_args;
|
2012-11-29 15:10:01 -07:00
|
|
|
const u32 * bitmask;
|
2005-04-16 16:20:36 -06:00
|
|
|
};
|
|
|
|
|
|
|
|
struct nfs4_pathconf_arg {
|
2012-11-29 15:10:01 -07:00
|
|
|
struct nfs4_sequence_args seq_args;
|
2005-04-16 16:20:36 -06:00
|
|
|
const struct nfs_fh * fh;
|
|
|
|
const u32 * bitmask;
|
|
|
|
};
|
|
|
|
|
2009-04-01 07:21:58 -06:00
|
|
|
struct nfs4_pathconf_res {
|
|
|
|
struct nfs4_sequence_res seq_res;
|
2012-11-29 15:10:01 -07:00
|
|
|
struct nfs_pathconf *pathconf;
|
2009-04-01 07:21:58 -06:00
|
|
|
};
|
|
|
|
|
2005-04-16 16:20:36 -06:00
|
|
|
struct nfs4_readdir_arg {
|
2012-11-29 15:10:01 -07:00
|
|
|
struct nfs4_sequence_args seq_args;
|
2005-04-16 16:20:36 -06:00
|
|
|
const struct nfs_fh * fh;
|
|
|
|
u64 cookie;
|
|
|
|
nfs4_verifier verifier;
|
|
|
|
u32 count;
|
|
|
|
struct page ** pages; /* zero-copy data */
|
|
|
|
unsigned int pgbase; /* zero-copy data */
|
|
|
|
const u32 * bitmask;
|
NFS: Readdir plus in v4
By requsting more attributes during a readdir, we can mimic the readdir plus
operation that was in NFSv3.
To test, I ran the command `ls -lU --color=none` on directories with various
numbers of files. Without readdir plus, I see this:
n files | 100 | 1,000 | 10,000 | 100,000 | 1,000,000
--------+-----------+-----------+-----------+-----------+----------
real | 0m00.153s | 0m00.589s | 0m05.601s | 0m56.691s | 9m59.128s
user | 0m00.007s | 0m00.007s | 0m00.077s | 0m00.703s | 0m06.800s
sys | 0m00.010s | 0m00.070s | 0m00.633s | 0m06.423s | 1m10.005s
access | 3 | 1 | 1 | 4 | 31
getattr | 2 | 1 | 1 | 1 | 1
lookup | 104 | 1,003 | 10,003 | 100,003 | 1,000,003
readdir | 2 | 16 | 158 | 1,575 | 15,749
total | 111 | 1,021 | 10,163 | 101,583 | 1,015,784
With readdir plus enabled, I see this:
n files | 100 | 1,000 | 10,000 | 100,000 | 1,000,000
--------+-----------+-----------+-----------+-----------+----------
real | 0m00.115s | 0m00.206s | 0m01.079s | 0m12.521s | 2m07.528s
user | 0m00.003s | 0m00.003s | 0m00.040s | 0m00.290s | 0m03.296s
sys | 0m00.007s | 0m00.020s | 0m00.120s | 0m01.357s | 0m17.556s
access | 3 | 1 | 1 | 1 | 7
getattr | 2 | 1 | 1 | 1 | 1
lookup | 4 | 3 | 3 | 3 | 3
readdir | 6 | 62 | 630 | 6,300 | 62,993
total | 15 | 67 | 635 | 6,305 | 63,004
Readdir plus disabled has about a 16x increase in the number of rpc calls and
is 4 - 5 times slower on large directories.
Signed-off-by: Bryan Schumaker <bjschuma@netapp.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
2010-10-21 14:33:18 -06:00
|
|
|
int plus;
|
2005-04-16 16:20:36 -06:00
|
|
|
};
|
|
|
|
|
|
|
|
struct nfs4_readdir_res {
|
2012-11-29 15:10:01 -07:00
|
|
|
struct nfs4_sequence_res seq_res;
|
2005-04-16 16:20:36 -06:00
|
|
|
nfs4_verifier verifier;
|
|
|
|
unsigned int pgbase;
|
|
|
|
};
|
|
|
|
|
|
|
|
struct nfs4_readlink {
|
2012-11-29 15:10:01 -07:00
|
|
|
struct nfs4_sequence_args seq_args;
|
2005-04-16 16:20:36 -06:00
|
|
|
const struct nfs_fh * fh;
|
|
|
|
unsigned int pgbase;
|
|
|
|
unsigned int pglen; /* zero-copy data */
|
|
|
|
struct page ** pages; /* zero-copy data */
|
|
|
|
};
|
|
|
|
|
2009-04-01 07:21:55 -06:00
|
|
|
struct nfs4_readlink_res {
|
|
|
|
struct nfs4_sequence_res seq_res;
|
|
|
|
};
|
|
|
|
|
2008-10-08 11:54:52 -06:00
|
|
|
#define NFS4_SETCLIENTID_NAMELEN (127)
|
2005-04-16 16:20:36 -06:00
|
|
|
struct nfs4_setclientid {
|
2007-12-10 12:56:54 -07:00
|
|
|
const nfs4_verifier * sc_verifier;
|
2005-04-16 16:20:36 -06:00
|
|
|
unsigned int sc_name_len;
|
NFS: SETCLIENTID truncates client ID and netid
The sc_name field is currently 56 bytes long. This is not large enough
to hold a pair of IPv6 addresses, the authentication type, the protocol
name, and a uniquifier number. The maximum possible size of the name
string using IPv6 addresses is just under 110 bytes, so I increased the
size of the sc_name field to accomodate this maximum.
In addition, the strings in the nfs4_setclientid structure are
constructed with scnprintf(), which wants to terminate its output with
'\0'. The sc_netid field was large enough only for a three byte netid
string and a '\0' so inet6 netids were being truncated. Perhaps we
don't need the overhead of scnprintf() to do a simple string copy, but
I fixed this by increasing the size of the buffer by one byte.
Since all three of the string buffers in nfs4_setclientid are
constructed with scnprintf(), I increased the size of all three by one
byte to document the requirement, although I don't think either the
universal address field or the name field will be so small that these
strings get truncated in this way.
The size of the Linux client's client ID on the wire will be larger
than before. RFC 3530 suggests the size limit for client IDs is 1024,
and we are still well below that.
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
2008-09-25 09:57:12 -06:00
|
|
|
char sc_name[NFS4_SETCLIENTID_NAMELEN + 1];
|
2007-12-10 12:56:54 -07:00
|
|
|
u32 sc_prog;
|
2005-04-16 16:20:36 -06:00
|
|
|
unsigned int sc_netid_len;
|
NFS: SETCLIENTID truncates client ID and netid
The sc_name field is currently 56 bytes long. This is not large enough
to hold a pair of IPv6 addresses, the authentication type, the protocol
name, and a uniquifier number. The maximum possible size of the name
string using IPv6 addresses is just under 110 bytes, so I increased the
size of the sc_name field to accomodate this maximum.
In addition, the strings in the nfs4_setclientid structure are
constructed with scnprintf(), which wants to terminate its output with
'\0'. The sc_netid field was large enough only for a three byte netid
string and a '\0' so inet6 netids were being truncated. Perhaps we
don't need the overhead of scnprintf() to do a simple string copy, but
I fixed this by increasing the size of the buffer by one byte.
Since all three of the string buffers in nfs4_setclientid are
constructed with scnprintf(), I increased the size of all three by one
byte to document the requirement, although I don't think either the
universal address field or the name field will be so small that these
strings get truncated in this way.
The size of the Linux client's client ID on the wire will be larger
than before. RFC 3530 suggests the size limit for client IDs is 1024,
and we are still well below that.
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
2008-09-25 09:57:12 -06:00
|
|
|
char sc_netid[RPCBIND_MAXNETIDLEN + 1];
|
2005-04-16 16:20:36 -06:00
|
|
|
unsigned int sc_uaddr_len;
|
NFS: SETCLIENTID truncates client ID and netid
The sc_name field is currently 56 bytes long. This is not large enough
to hold a pair of IPv6 addresses, the authentication type, the protocol
name, and a uniquifier number. The maximum possible size of the name
string using IPv6 addresses is just under 110 bytes, so I increased the
size of the sc_name field to accomodate this maximum.
In addition, the strings in the nfs4_setclientid structure are
constructed with scnprintf(), which wants to terminate its output with
'\0'. The sc_netid field was large enough only for a three byte netid
string and a '\0' so inet6 netids were being truncated. Perhaps we
don't need the overhead of scnprintf() to do a simple string copy, but
I fixed this by increasing the size of the buffer by one byte.
Since all three of the string buffers in nfs4_setclientid are
constructed with scnprintf(), I increased the size of all three by one
byte to document the requirement, although I don't think either the
universal address field or the name field will be so small that these
strings get truncated in this way.
The size of the Linux client's client ID on the wire will be larger
than before. RFC 3530 suggests the size limit for client IDs is 1024,
and we are still well below that.
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
2008-09-25 09:57:12 -06:00
|
|
|
char sc_uaddr[RPCBIND_MAXUADDRLEN + 1];
|
2007-12-10 12:56:54 -07:00
|
|
|
u32 sc_cb_ident;
|
2005-04-16 16:20:36 -06:00
|
|
|
};
|
|
|
|
|
2010-04-16 14:43:06 -06:00
|
|
|
struct nfs4_setclientid_res {
|
|
|
|
u64 clientid;
|
|
|
|
nfs4_verifier confirm;
|
|
|
|
};
|
|
|
|
|
2005-04-16 16:20:36 -06:00
|
|
|
struct nfs4_statfs_arg {
|
2012-11-29 15:10:01 -07:00
|
|
|
struct nfs4_sequence_args seq_args;
|
2005-04-16 16:20:36 -06:00
|
|
|
const struct nfs_fh * fh;
|
|
|
|
const u32 * bitmask;
|
|
|
|
};
|
|
|
|
|
2009-04-01 07:21:56 -06:00
|
|
|
struct nfs4_statfs_res {
|
|
|
|
struct nfs4_sequence_res seq_res;
|
2012-11-29 15:10:01 -07:00
|
|
|
struct nfs_fsstat *fsstat;
|
2009-04-01 07:21:56 -06:00
|
|
|
};
|
|
|
|
|
2009-04-01 07:21:54 -06:00
|
|
|
struct nfs4_server_caps_arg {
|
|
|
|
struct nfs4_sequence_args seq_args;
|
2012-11-29 15:10:01 -07:00
|
|
|
struct nfs_fh *fhandle;
|
2009-04-01 07:21:54 -06:00
|
|
|
};
|
|
|
|
|
2005-04-16 16:20:36 -06:00
|
|
|
struct nfs4_server_caps_res {
|
2012-11-29 15:10:01 -07:00
|
|
|
struct nfs4_sequence_res seq_res;
|
2011-07-30 18:52:37 -06:00
|
|
|
u32 attr_bitmask[3];
|
2005-04-16 16:20:36 -06:00
|
|
|
u32 acl_bitmask;
|
|
|
|
u32 has_links;
|
|
|
|
u32 has_symlinks;
|
2012-03-01 15:02:05 -07:00
|
|
|
u32 fh_expire_type;
|
2005-04-16 16:20:36 -06:00
|
|
|
};
|
|
|
|
|
2006-06-09 07:34:23 -06:00
|
|
|
#define NFS4_PATHNAME_MAXCOMPONENTS 512
|
|
|
|
struct nfs4_pathname {
|
|
|
|
unsigned int ncomponents;
|
|
|
|
struct nfs4_string components[NFS4_PATHNAME_MAXCOMPONENTS];
|
|
|
|
};
|
|
|
|
|
|
|
|
#define NFS4_FS_LOCATION_MAXSERVERS 10
|
|
|
|
struct nfs4_fs_location {
|
|
|
|
unsigned int nservers;
|
|
|
|
struct nfs4_string servers[NFS4_FS_LOCATION_MAXSERVERS];
|
|
|
|
struct nfs4_pathname rootpath;
|
|
|
|
};
|
|
|
|
|
|
|
|
#define NFS4_FS_LOCATIONS_MAXENTRIES 10
|
|
|
|
struct nfs4_fs_locations {
|
2006-06-09 07:34:22 -06:00
|
|
|
struct nfs_fattr fattr;
|
|
|
|
const struct nfs_server *server;
|
2006-06-09 07:34:23 -06:00
|
|
|
struct nfs4_pathname fs_path;
|
2006-06-09 07:34:22 -06:00
|
|
|
int nlocations;
|
2006-06-09 07:34:23 -06:00
|
|
|
struct nfs4_fs_location locations[NFS4_FS_LOCATIONS_MAXENTRIES];
|
2006-06-09 07:34:22 -06:00
|
|
|
};
|
|
|
|
|
|
|
|
struct nfs4_fs_locations_arg {
|
2012-11-29 15:10:01 -07:00
|
|
|
struct nfs4_sequence_args seq_args;
|
2006-06-09 07:34:22 -06:00
|
|
|
const struct nfs_fh *dir_fh;
|
2013-10-17 12:12:50 -06:00
|
|
|
const struct nfs_fh *fh;
|
2006-06-09 07:34:22 -06:00
|
|
|
const struct qstr *name;
|
|
|
|
struct page *page;
|
|
|
|
const u32 *bitmask;
|
2013-10-17 12:12:50 -06:00
|
|
|
clientid4 clientid;
|
|
|
|
unsigned char migration:1, renew:1;
|
2006-06-09 07:34:22 -06:00
|
|
|
};
|
|
|
|
|
2009-04-01 07:22:02 -06:00
|
|
|
struct nfs4_fs_locations_res {
|
|
|
|
struct nfs4_sequence_res seq_res;
|
2012-11-29 15:10:01 -07:00
|
|
|
struct nfs4_fs_locations *fs_locations;
|
2013-10-17 12:12:50 -06:00
|
|
|
unsigned char migration:1, renew:1;
|
2009-04-01 07:22:02 -06:00
|
|
|
};
|
|
|
|
|
2013-03-16 13:54:34 -06:00
|
|
|
struct nfs4_secinfo4 {
|
|
|
|
u32 flavor;
|
|
|
|
struct rpcsec_gss_info flavor_info;
|
2011-03-24 11:12:29 -06:00
|
|
|
};
|
|
|
|
|
|
|
|
struct nfs4_secinfo_flavors {
|
2013-03-16 13:54:34 -06:00
|
|
|
unsigned int num_flavors;
|
|
|
|
struct nfs4_secinfo4 flavors[0];
|
2011-03-24 11:12:29 -06:00
|
|
|
};
|
|
|
|
|
|
|
|
struct nfs4_secinfo_arg {
|
2012-11-29 15:10:01 -07:00
|
|
|
struct nfs4_sequence_args seq_args;
|
2011-03-24 11:12:29 -06:00
|
|
|
const struct nfs_fh *dir_fh;
|
|
|
|
const struct qstr *name;
|
|
|
|
};
|
|
|
|
|
|
|
|
struct nfs4_secinfo_res {
|
|
|
|
struct nfs4_sequence_res seq_res;
|
2012-11-29 15:10:01 -07:00
|
|
|
struct nfs4_secinfo_flavors *flavors;
|
2011-03-24 11:12:29 -06:00
|
|
|
};
|
|
|
|
|
2013-10-17 12:13:30 -06:00
|
|
|
struct nfs4_fsid_present_arg {
|
|
|
|
struct nfs4_sequence_args seq_args;
|
|
|
|
const struct nfs_fh *fh;
|
|
|
|
clientid4 clientid;
|
|
|
|
unsigned char renew:1;
|
|
|
|
};
|
|
|
|
|
|
|
|
struct nfs4_fsid_present_res {
|
|
|
|
struct nfs4_sequence_res seq_res;
|
|
|
|
struct nfs_fh *fh;
|
|
|
|
unsigned char renew:1;
|
|
|
|
};
|
|
|
|
|
2005-04-16 16:20:36 -06:00
|
|
|
#endif /* CONFIG_NFS_V4 */
|
|
|
|
|
2009-04-01 07:22:29 -06:00
|
|
|
struct nfstime4 {
|
|
|
|
u64 seconds;
|
|
|
|
u32 nseconds;
|
|
|
|
};
|
|
|
|
|
|
|
|
#ifdef CONFIG_NFS_V4_1
|
2012-04-20 12:47:53 -06:00
|
|
|
|
|
|
|
struct pnfs_commit_bucket {
|
|
|
|
struct list_head written;
|
|
|
|
struct list_head committing;
|
|
|
|
struct pnfs_layout_segment *wlseg;
|
|
|
|
struct pnfs_layout_segment *clseg;
|
|
|
|
};
|
|
|
|
|
|
|
|
struct pnfs_ds_commit_info {
|
|
|
|
int nwritten;
|
|
|
|
int ncommitting;
|
|
|
|
int nbuckets;
|
|
|
|
struct pnfs_commit_bucket *buckets;
|
|
|
|
};
|
|
|
|
|
2013-08-13 14:37:32 -06:00
|
|
|
#define NFS4_OP_MAP_NUM_LONGS \
|
|
|
|
DIV_ROUND_UP(LAST_NFS4_OP, 8 * sizeof(unsigned long))
|
|
|
|
#define NFS4_OP_MAP_NUM_WORDS \
|
|
|
|
(NFS4_OP_MAP_NUM_LONGS * sizeof(unsigned long) / sizeof(u32))
|
|
|
|
struct nfs4_op_map {
|
|
|
|
union {
|
|
|
|
unsigned long longs[NFS4_OP_MAP_NUM_LONGS];
|
|
|
|
u32 words[NFS4_OP_MAP_NUM_WORDS];
|
|
|
|
} u;
|
|
|
|
};
|
|
|
|
|
|
|
|
struct nfs41_state_protection {
|
|
|
|
u32 how;
|
|
|
|
struct nfs4_op_map enforce;
|
|
|
|
struct nfs4_op_map allow;
|
|
|
|
};
|
|
|
|
|
2009-04-01 07:22:29 -06:00
|
|
|
#define NFS4_EXCHANGE_ID_LEN (48)
|
|
|
|
struct nfs41_exchange_id_args {
|
|
|
|
struct nfs_client *client;
|
|
|
|
nfs4_verifier *verifier;
|
|
|
|
unsigned int id_len;
|
|
|
|
char id[NFS4_EXCHANGE_ID_LEN];
|
|
|
|
u32 flags;
|
2013-08-13 14:37:32 -06:00
|
|
|
struct nfs41_state_protection state_protect;
|
2009-04-01 07:22:29 -06:00
|
|
|
};
|
|
|
|
|
2012-05-21 20:46:16 -06:00
|
|
|
struct nfs41_server_owner {
|
2009-04-01 07:22:29 -06:00
|
|
|
uint64_t minor_id;
|
|
|
|
uint32_t major_id_sz;
|
|
|
|
char major_id[NFS4_OPAQUE_LIMIT];
|
|
|
|
};
|
|
|
|
|
2012-05-21 20:44:31 -06:00
|
|
|
struct nfs41_server_scope {
|
2009-04-01 07:22:29 -06:00
|
|
|
uint32_t server_scope_sz;
|
|
|
|
char server_scope[NFS4_OPAQUE_LIMIT];
|
|
|
|
};
|
|
|
|
|
2012-02-17 13:20:26 -07:00
|
|
|
struct nfs41_impl_id {
|
|
|
|
char domain[NFS4_OPAQUE_LIMIT + 1];
|
|
|
|
char name[NFS4_OPAQUE_LIMIT + 1];
|
|
|
|
struct nfstime4 date;
|
|
|
|
};
|
|
|
|
|
2012-05-24 11:22:50 -06:00
|
|
|
struct nfs41_bind_conn_to_session_res {
|
|
|
|
struct nfs4_session *session;
|
|
|
|
u32 dir;
|
|
|
|
bool use_conn_in_rdma_mode;
|
|
|
|
};
|
|
|
|
|
2009-04-01 07:22:29 -06:00
|
|
|
struct nfs41_exchange_id_res {
|
2012-05-26 11:41:04 -06:00
|
|
|
u64 clientid;
|
|
|
|
u32 seqid;
|
2009-04-01 07:22:29 -06:00
|
|
|
u32 flags;
|
2012-05-21 20:46:16 -06:00
|
|
|
struct nfs41_server_owner *server_owner;
|
2012-05-21 20:44:31 -06:00
|
|
|
struct nfs41_server_scope *server_scope;
|
2012-02-17 13:20:26 -07:00
|
|
|
struct nfs41_impl_id *impl_id;
|
2013-08-13 14:37:32 -06:00
|
|
|
struct nfs41_state_protection state_protect;
|
2009-04-01 07:22:29 -06:00
|
|
|
};
|
2009-04-01 07:22:31 -06:00
|
|
|
|
|
|
|
struct nfs41_create_session_args {
|
|
|
|
struct nfs_client *client;
|
|
|
|
uint32_t flags;
|
|
|
|
uint32_t cb_program;
|
|
|
|
struct nfs4_channel_attrs fc_attrs; /* Fore Channel */
|
|
|
|
struct nfs4_channel_attrs bc_attrs; /* Back Channel */
|
|
|
|
};
|
|
|
|
|
|
|
|
struct nfs41_create_session_res {
|
|
|
|
struct nfs_client *client;
|
|
|
|
};
|
2009-12-05 14:08:40 -07:00
|
|
|
|
|
|
|
struct nfs41_reclaim_complete_args {
|
2012-11-29 15:10:01 -07:00
|
|
|
struct nfs4_sequence_args seq_args;
|
2009-12-05 14:08:40 -07:00
|
|
|
/* In the future extend to include curr_fh for use with migration */
|
|
|
|
unsigned char one_fs:1;
|
|
|
|
};
|
|
|
|
|
|
|
|
struct nfs41_reclaim_complete_res {
|
|
|
|
struct nfs4_sequence_res seq_res;
|
|
|
|
};
|
2011-06-02 12:59:07 -06:00
|
|
|
|
|
|
|
#define SECINFO_STYLE_CURRENT_FH 0
|
|
|
|
#define SECINFO_STYLE_PARENT 1
|
|
|
|
struct nfs41_secinfo_no_name_args {
|
|
|
|
struct nfs4_sequence_args seq_args;
|
2012-11-29 15:10:01 -07:00
|
|
|
int style;
|
2011-06-02 12:59:07 -06:00
|
|
|
};
|
|
|
|
|
2011-06-02 12:59:08 -06:00
|
|
|
struct nfs41_test_stateid_args {
|
|
|
|
struct nfs4_sequence_args seq_args;
|
2012-11-29 15:10:01 -07:00
|
|
|
nfs4_stateid *stateid;
|
2011-06-02 12:59:08 -06:00
|
|
|
};
|
|
|
|
|
|
|
|
struct nfs41_test_stateid_res {
|
|
|
|
struct nfs4_sequence_res seq_res;
|
2012-11-29 15:10:01 -07:00
|
|
|
unsigned int status;
|
2011-06-02 12:59:08 -06:00
|
|
|
};
|
|
|
|
|
2011-06-02 12:59:09 -06:00
|
|
|
struct nfs41_free_stateid_args {
|
|
|
|
struct nfs4_sequence_args seq_args;
|
2013-05-03 12:40:01 -06:00
|
|
|
nfs4_stateid stateid;
|
2011-06-02 12:59:09 -06:00
|
|
|
};
|
|
|
|
|
|
|
|
struct nfs41_free_stateid_res {
|
|
|
|
struct nfs4_sequence_res seq_res;
|
2012-11-29 15:10:01 -07:00
|
|
|
unsigned int status;
|
2011-06-02 12:59:09 -06:00
|
|
|
};
|
|
|
|
|
2012-04-30 16:39:20 -06:00
|
|
|
#else
|
|
|
|
|
|
|
|
struct pnfs_ds_commit_info {
|
|
|
|
};
|
|
|
|
|
2009-04-01 07:22:29 -06:00
|
|
|
#endif /* CONFIG_NFS_V4_1 */
|
|
|
|
|
2005-04-16 16:20:36 -06:00
|
|
|
struct nfs_page;
|
|
|
|
|
2005-11-30 16:09:02 -07:00
|
|
|
#define NFS_PAGEVEC_SIZE (8U)
|
|
|
|
|
2012-04-20 12:47:45 -06:00
|
|
|
struct nfs_page_array {
|
|
|
|
struct page **pagevec;
|
|
|
|
unsigned int npages; /* Max length of pagevec */
|
|
|
|
struct page *page_array[NFS_PAGEVEC_SIZE];
|
|
|
|
};
|
|
|
|
|
2005-04-16 16:20:36 -06:00
|
|
|
struct nfs_read_data {
|
2012-04-20 12:47:44 -06:00
|
|
|
struct nfs_pgio_header *header;
|
|
|
|
struct list_head list;
|
2005-04-16 16:20:36 -06:00
|
|
|
struct rpc_task task;
|
|
|
|
struct nfs_fattr fattr; /* fattr storage */
|
|
|
|
struct nfs_readargs args;
|
|
|
|
struct nfs_readres res;
|
|
|
|
unsigned long timestamp; /* For lease renewal */
|
2011-02-28 18:34:20 -07:00
|
|
|
int (*read_done_cb) (struct rpc_task *task, struct nfs_read_data *data);
|
2011-02-28 18:34:19 -07:00
|
|
|
__u64 mds_offset;
|
2012-04-20 12:47:45 -06:00
|
|
|
struct nfs_page_array pages;
|
2012-04-20 12:47:44 -06:00
|
|
|
struct nfs_client *ds_clp; /* pNFS data server */
|
|
|
|
};
|
|
|
|
|
2012-04-20 12:47:46 -06:00
|
|
|
/* used as flag bits in nfs_pgio_header */
|
|
|
|
enum {
|
|
|
|
NFS_IOHDR_ERROR = 0,
|
|
|
|
NFS_IOHDR_EOF,
|
|
|
|
NFS_IOHDR_REDO,
|
2012-04-20 12:47:47 -06:00
|
|
|
NFS_IOHDR_NEED_COMMIT,
|
|
|
|
NFS_IOHDR_NEED_RESCHED,
|
2012-04-20 12:47:46 -06:00
|
|
|
};
|
|
|
|
|
2012-04-20 12:47:44 -06:00
|
|
|
struct nfs_pgio_header {
|
|
|
|
struct inode *inode;
|
|
|
|
struct rpc_cred *cred;
|
|
|
|
struct list_head pages;
|
2012-04-20 12:47:46 -06:00
|
|
|
struct list_head rpc_list;
|
|
|
|
atomic_t refcnt;
|
2012-04-20 12:47:44 -06:00
|
|
|
struct nfs_page *req;
|
2012-06-05 16:32:03 -06:00
|
|
|
struct nfs_writeverf *verf;
|
2012-04-20 12:47:44 -06:00
|
|
|
struct pnfs_layout_segment *lseg;
|
2012-04-20 12:47:46 -06:00
|
|
|
loff_t io_start;
|
2012-04-20 12:47:44 -06:00
|
|
|
const struct rpc_call_ops *mds_ops;
|
2012-04-20 12:47:46 -06:00
|
|
|
void (*release) (struct nfs_pgio_header *hdr);
|
2012-04-20 12:47:48 -06:00
|
|
|
const struct nfs_pgio_completion_ops *completion_ops;
|
2012-04-20 12:47:51 -06:00
|
|
|
struct nfs_direct_req *dreq;
|
2012-08-02 06:36:09 -06:00
|
|
|
void *layout_private;
|
2012-04-20 12:47:46 -06:00
|
|
|
spinlock_t lock;
|
|
|
|
/* fields protected by lock */
|
2012-04-20 12:47:44 -06:00
|
|
|
int pnfs_error;
|
2012-04-20 12:47:46 -06:00
|
|
|
int error; /* merge with pnfs_error */
|
|
|
|
unsigned long good_bytes; /* boundary of good data */
|
|
|
|
unsigned long flags;
|
2012-04-20 12:47:44 -06:00
|
|
|
};
|
|
|
|
|
|
|
|
struct nfs_read_header {
|
|
|
|
struct nfs_pgio_header header;
|
|
|
|
struct nfs_read_data rpc_data;
|
2005-04-16 16:20:36 -06:00
|
|
|
};
|
|
|
|
|
|
|
|
struct nfs_write_data {
|
2012-04-20 12:47:44 -06:00
|
|
|
struct nfs_pgio_header *header;
|
|
|
|
struct list_head list;
|
2005-04-16 16:20:36 -06:00
|
|
|
struct rpc_task task;
|
|
|
|
struct nfs_fattr fattr;
|
|
|
|
struct nfs_writeverf verf;
|
|
|
|
struct nfs_writeargs args; /* argument struct */
|
|
|
|
struct nfs_writeres res; /* result struct */
|
|
|
|
unsigned long timestamp; /* For lease renewal */
|
2012-04-20 12:47:44 -06:00
|
|
|
int (*write_done_cb) (struct rpc_task *task, struct nfs_write_data *data);
|
2011-03-03 08:13:47 -07:00
|
|
|
__u64 mds_offset; /* Filelayout dense stripe */
|
2012-04-20 12:47:45 -06:00
|
|
|
struct nfs_page_array pages;
|
2012-04-20 12:47:44 -06:00
|
|
|
struct nfs_client *ds_clp; /* pNFS data server */
|
|
|
|
};
|
|
|
|
|
|
|
|
struct nfs_write_header {
|
|
|
|
struct nfs_pgio_header header;
|
|
|
|
struct nfs_write_data rpc_data;
|
2012-06-05 16:32:03 -06:00
|
|
|
struct nfs_writeverf verf;
|
2005-04-16 16:20:36 -06:00
|
|
|
};
|
|
|
|
|
2012-04-20 12:47:53 -06:00
|
|
|
struct nfs_mds_commit_info {
|
|
|
|
atomic_t rpcs_out;
|
|
|
|
unsigned long ncommit;
|
|
|
|
struct list_head list;
|
|
|
|
};
|
|
|
|
|
2012-04-20 12:47:54 -06:00
|
|
|
struct nfs_commit_data;
|
|
|
|
struct nfs_inode;
|
|
|
|
struct nfs_commit_completion_ops {
|
|
|
|
void (*error_cleanup) (struct nfs_inode *nfsi);
|
|
|
|
void (*completion) (struct nfs_commit_data *data);
|
|
|
|
};
|
|
|
|
|
2012-04-20 12:47:53 -06:00
|
|
|
struct nfs_commit_info {
|
|
|
|
spinlock_t *lock;
|
|
|
|
struct nfs_mds_commit_info *mds;
|
|
|
|
struct pnfs_ds_commit_info *ds;
|
2012-04-20 12:47:55 -06:00
|
|
|
struct nfs_direct_req *dreq; /* O_DIRECT request */
|
2012-04-20 12:47:54 -06:00
|
|
|
const struct nfs_commit_completion_ops *completion_ops;
|
2012-04-20 12:47:53 -06:00
|
|
|
};
|
|
|
|
|
2012-04-20 12:47:39 -06:00
|
|
|
struct nfs_commit_data {
|
|
|
|
struct rpc_task task;
|
|
|
|
struct inode *inode;
|
|
|
|
struct rpc_cred *cred;
|
|
|
|
struct nfs_fattr fattr;
|
|
|
|
struct nfs_writeverf verf;
|
|
|
|
struct list_head pages; /* Coalesced requests we wish to flush */
|
|
|
|
struct list_head list; /* lists of struct nfs_write_data */
|
|
|
|
struct nfs_direct_req *dreq; /* O_DIRECT request */
|
|
|
|
struct nfs_commitargs args; /* argument struct */
|
|
|
|
struct nfs_commitres res; /* result struct */
|
|
|
|
struct nfs_open_context *context;
|
|
|
|
struct pnfs_layout_segment *lseg;
|
|
|
|
struct nfs_client *ds_clp; /* pNFS data server */
|
|
|
|
int ds_commit_index;
|
|
|
|
const struct rpc_call_ops *mds_ops;
|
2012-04-20 12:47:54 -06:00
|
|
|
const struct nfs_commit_completion_ops *completion_ops;
|
2012-04-20 12:47:39 -06:00
|
|
|
int (*commit_done_cb) (struct rpc_task *task, struct nfs_commit_data *data);
|
|
|
|
};
|
|
|
|
|
2012-04-20 12:47:48 -06:00
|
|
|
struct nfs_pgio_completion_ops {
|
|
|
|
void (*error_cleanup)(struct list_head *head);
|
2012-04-20 12:47:51 -06:00
|
|
|
void (*init_hdr)(struct nfs_pgio_header *hdr);
|
2012-04-20 12:47:48 -06:00
|
|
|
void (*completion)(struct nfs_pgio_header *hdr);
|
|
|
|
};
|
|
|
|
|
2012-03-19 12:54:41 -06:00
|
|
|
struct nfs_unlinkdata {
|
|
|
|
struct hlist_node list;
|
|
|
|
struct nfs_removeargs args;
|
|
|
|
struct nfs_removeres res;
|
|
|
|
struct inode *dir;
|
|
|
|
struct rpc_cred *cred;
|
|
|
|
struct nfs_fattr dir_attr;
|
|
|
|
};
|
|
|
|
|
2012-03-19 12:54:42 -06:00
|
|
|
struct nfs_renamedata {
|
|
|
|
struct nfs_renameargs args;
|
|
|
|
struct nfs_renameres res;
|
|
|
|
struct rpc_cred *cred;
|
|
|
|
struct inode *old_dir;
|
|
|
|
struct dentry *old_dentry;
|
|
|
|
struct nfs_fattr old_fattr;
|
|
|
|
struct inode *new_dir;
|
|
|
|
struct dentry *new_dentry;
|
|
|
|
struct nfs_fattr new_fattr;
|
2014-03-17 05:06:54 -06:00
|
|
|
void (*complete)(struct rpc_task *, struct nfs_renamedata *);
|
2012-03-19 12:54:42 -06:00
|
|
|
};
|
|
|
|
|
2005-04-16 16:20:36 -06:00
|
|
|
struct nfs_access_entry;
|
2011-02-28 18:34:08 -07:00
|
|
|
struct nfs_client;
|
2011-03-14 16:20:01 -06:00
|
|
|
struct rpc_timeout;
|
2012-07-30 14:05:18 -06:00
|
|
|
struct nfs_subversion;
|
|
|
|
struct nfs_mount_info;
|
2012-06-20 13:53:46 -06:00
|
|
|
struct nfs_client_initdata;
|
2012-06-20 13:53:47 -06:00
|
|
|
struct nfs_pageio_descriptor;
|
2005-04-16 16:20:36 -06:00
|
|
|
|
|
|
|
/*
|
|
|
|
* RPC procedure vector for NFSv2/NFSv3 demuxing
|
|
|
|
*/
|
|
|
|
struct nfs_rpc_ops {
|
2008-01-14 10:32:05 -07:00
|
|
|
u32 version; /* Protocol version */
|
2009-02-19 22:51:22 -07:00
|
|
|
const struct dentry_operations *dentry_ops;
|
2007-02-12 01:55:40 -07:00
|
|
|
const struct inode_operations *dir_inode_ops;
|
|
|
|
const struct inode_operations *file_inode_ops;
|
nfs: when attempting to open a directory, fall back on normal lookup (try #5)
commit d953126 changed how nfs_atomic_lookup handles an -EISDIR return
from an OPEN call. Prior to that patch, that caused the client to fall
back to doing a normal lookup. When that patch went in, the code began
returning that error to userspace. The d_revalidate codepath however
never had the corresponding change, so it was still possible to end up
with a NULL ctx->state pointer after that.
That patch caused a regression. When we attempt to open a directory that
does not have a cached dentry, that open now errors out with EISDIR. If
you attempt the same open with a cached dentry, it will succeed.
Fix this by reverting the change in nfs_atomic_lookup and allowing
attempts to open directories to fall back to a normal lookup
Also, add a NFSv4-specific f_ops->open routine that just returns
-ENOTDIR. This should never be called if things are working properly,
but if it ever is, then the dprintk may help in debugging.
To facilitate this, a new file_operations field is also added to the
nfs_rpc_ops struct.
Cc: stable@kernel.org
Signed-off-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
2011-11-04 11:31:21 -06:00
|
|
|
const struct file_operations *file_ops;
|
2005-04-16 16:20:36 -06:00
|
|
|
|
|
|
|
int (*getroot) (struct nfs_server *, struct nfs_fh *,
|
|
|
|
struct nfs_fsinfo *);
|
2012-04-27 11:27:45 -06:00
|
|
|
struct vfsmount *(*submount) (struct nfs_server *, struct dentry *,
|
|
|
|
struct nfs_fh *, struct nfs_fattr *);
|
2012-07-30 14:05:18 -06:00
|
|
|
struct dentry *(*try_mount) (int, const char *, struct nfs_mount_info *,
|
|
|
|
struct nfs_subversion *);
|
2005-04-16 16:20:36 -06:00
|
|
|
int (*getattr) (struct nfs_server *, struct nfs_fh *,
|
2013-05-22 10:50:42 -06:00
|
|
|
struct nfs_fattr *, struct nfs4_label *);
|
2005-04-16 16:20:36 -06:00
|
|
|
int (*setattr) (struct dentry *, struct nfs_fattr *,
|
|
|
|
struct iattr *);
|
2012-04-27 11:27:46 -06:00
|
|
|
int (*lookup) (struct inode *, struct qstr *,
|
2013-05-22 10:50:42 -06:00
|
|
|
struct nfs_fh *, struct nfs_fattr *,
|
|
|
|
struct nfs4_label *);
|
2005-04-16 16:20:36 -06:00
|
|
|
int (*access) (struct inode *, struct nfs_access_entry *);
|
|
|
|
int (*readlink)(struct inode *, struct page *, unsigned int,
|
|
|
|
unsigned int);
|
|
|
|
int (*create) (struct inode *, struct dentry *,
|
2012-06-05 07:10:19 -06:00
|
|
|
struct iattr *, int);
|
2005-04-16 16:20:36 -06:00
|
|
|
int (*remove) (struct inode *, struct qstr *);
|
2007-07-14 13:39:58 -06:00
|
|
|
void (*unlink_setup) (struct rpc_message *, struct inode *dir);
|
2012-03-19 12:54:41 -06:00
|
|
|
void (*unlink_rpc_prepare) (struct rpc_task *, struct nfs_unlinkdata *);
|
2007-07-14 13:39:58 -06:00
|
|
|
int (*unlink_done) (struct rpc_task *, struct inode *);
|
2010-09-17 15:31:57 -06:00
|
|
|
void (*rename_setup) (struct rpc_message *msg, struct inode *dir);
|
2012-03-19 12:54:42 -06:00
|
|
|
void (*rename_rpc_prepare)(struct rpc_task *task, struct nfs_renamedata *);
|
2010-09-17 15:31:57 -06:00
|
|
|
int (*rename_done) (struct rpc_task *task, struct inode *old_dir, struct inode *new_dir);
|
2005-04-16 16:20:36 -06:00
|
|
|
int (*link) (struct inode *, struct inode *, struct qstr *);
|
2006-08-22 18:06:23 -06:00
|
|
|
int (*symlink) (struct inode *, struct dentry *, struct page *,
|
|
|
|
unsigned int, struct iattr *);
|
2005-04-16 16:20:36 -06:00
|
|
|
int (*mkdir) (struct inode *, struct dentry *, struct iattr *);
|
|
|
|
int (*rmdir) (struct inode *, struct qstr *);
|
|
|
|
int (*readdir) (struct dentry *, struct rpc_cred *,
|
2010-10-20 13:44:37 -06:00
|
|
|
u64, struct page **, unsigned int, int);
|
2005-04-16 16:20:36 -06:00
|
|
|
int (*mknod) (struct inode *, struct dentry *, struct iattr *,
|
|
|
|
dev_t);
|
|
|
|
int (*statfs) (struct nfs_server *, struct nfs_fh *,
|
|
|
|
struct nfs_fsstat *);
|
|
|
|
int (*fsinfo) (struct nfs_server *, struct nfs_fh *,
|
|
|
|
struct nfs_fsinfo *);
|
|
|
|
int (*pathconf) (struct nfs_server *, struct nfs_fh *,
|
|
|
|
struct nfs_pathconf *);
|
2006-08-22 18:06:10 -06:00
|
|
|
int (*set_capabilities)(struct nfs_server *, struct nfs_fh *);
|
2010-12-14 07:58:11 -07:00
|
|
|
int (*decode_dirent)(struct xdr_stream *, struct nfs_entry *, int);
|
2007-07-14 13:40:00 -06:00
|
|
|
void (*read_setup) (struct nfs_read_data *, struct rpc_message *);
|
2012-06-20 13:53:47 -06:00
|
|
|
void (*read_pageio_init)(struct nfs_pageio_descriptor *, struct inode *,
|
|
|
|
const struct nfs_pgio_completion_ops *);
|
2013-09-04 01:04:49 -06:00
|
|
|
int (*read_rpc_prepare)(struct rpc_task *, struct nfs_read_data *);
|
2006-03-20 11:44:27 -07:00
|
|
|
int (*read_done) (struct rpc_task *, struct nfs_read_data *);
|
2007-07-14 13:40:00 -06:00
|
|
|
void (*write_setup) (struct nfs_write_data *, struct rpc_message *);
|
2012-06-20 13:53:48 -06:00
|
|
|
void (*write_pageio_init)(struct nfs_pageio_descriptor *, struct inode *, int,
|
|
|
|
const struct nfs_pgio_completion_ops *);
|
2013-09-04 01:04:49 -06:00
|
|
|
int (*write_rpc_prepare)(struct rpc_task *, struct nfs_write_data *);
|
2006-03-20 11:44:27 -07:00
|
|
|
int (*write_done) (struct rpc_task *, struct nfs_write_data *);
|
2012-04-20 12:47:39 -06:00
|
|
|
void (*commit_setup) (struct nfs_commit_data *, struct rpc_message *);
|
|
|
|
void (*commit_rpc_prepare)(struct rpc_task *, struct nfs_commit_data *);
|
|
|
|
int (*commit_done) (struct rpc_task *, struct nfs_commit_data *);
|
2005-04-16 16:20:36 -06:00
|
|
|
int (*lock)(struct file *, int, struct file_lock *);
|
2008-05-20 17:34:39 -06:00
|
|
|
int (*lock_check_bounds)(const struct file_lock *);
|
2005-06-22 11:16:22 -06:00
|
|
|
void (*clear_acl_cache)(struct inode *);
|
2009-03-19 13:35:50 -06:00
|
|
|
void (*close_context)(struct nfs_open_context *ctx, int);
|
2010-09-17 08:56:51 -06:00
|
|
|
struct inode * (*open_context) (struct inode *dir,
|
|
|
|
struct nfs_open_context *ctx,
|
|
|
|
int open_flags,
|
2013-09-23 16:01:28 -06:00
|
|
|
struct iattr *iattr,
|
|
|
|
int *);
|
2012-06-20 13:53:43 -06:00
|
|
|
int (*have_delegation)(struct inode *, fmode_t);
|
2012-06-20 13:53:44 -06:00
|
|
|
int (*return_delegation)(struct inode *);
|
2012-06-20 13:53:46 -06:00
|
|
|
struct nfs_client *(*alloc_client) (const struct nfs_client_initdata *);
|
2012-05-21 20:45:59 -06:00
|
|
|
struct nfs_client *
|
|
|
|
(*init_client) (struct nfs_client *, const struct rpc_timeout *,
|
2013-07-24 09:59:49 -06:00
|
|
|
const char *);
|
2012-06-20 13:53:45 -06:00
|
|
|
void (*free_client) (struct nfs_client *);
|
2012-07-30 14:05:19 -06:00
|
|
|
struct nfs_server *(*create_server)(struct nfs_mount_info *, struct nfs_subversion *);
|
|
|
|
struct nfs_server *(*clone_server)(struct nfs_server *, struct nfs_fh *,
|
|
|
|
struct nfs_fattr *, rpc_authflavor_t);
|
2005-04-16 16:20:36 -06:00
|
|
|
};
|
|
|
|
|
|
|
|
/*
|
|
|
|
* NFS_CALL(getattr, inode, (fattr));
|
|
|
|
* into
|
|
|
|
* NFS_PROTO(inode)->getattr(fattr);
|
|
|
|
*/
|
|
|
|
#define NFS_CALL(op, inode, args) NFS_PROTO(inode)->op args
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Function vectors etc. for the NFS client
|
|
|
|
*/
|
2006-08-22 18:06:11 -06:00
|
|
|
extern const struct nfs_rpc_ops nfs_v2_clientops;
|
|
|
|
extern const struct nfs_rpc_ops nfs_v3_clientops;
|
|
|
|
extern const struct nfs_rpc_ops nfs_v4_clientops;
|
2012-01-20 11:53:56 -07:00
|
|
|
extern const struct rpc_version nfs_version2;
|
|
|
|
extern const struct rpc_version nfs_version3;
|
|
|
|
extern const struct rpc_version nfs_version4;
|
2005-04-16 16:20:36 -06:00
|
|
|
|
2012-01-20 11:53:56 -07:00
|
|
|
extern const struct rpc_version nfsacl_version3;
|
|
|
|
extern const struct rpc_program nfsacl_program;
|
2005-06-22 11:16:27 -06:00
|
|
|
|
2005-04-16 16:20:36 -06:00
|
|
|
#endif
|