projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
proper prototype for signals_init()
[deliverable/linux.git]
/
include
/
linux
/
nfs_xdr.h
diff --git
a/include/linux/nfs_xdr.h
b/include/linux/nfs_xdr.h
index 10c26ed0db7129831d42b109f2aa2bbc222f0286..f301d0b8babc99a94485e089cdfbca401c1407d8 100644
(file)
--- a/
include/linux/nfs_xdr.h
+++ b/
include/linux/nfs_xdr.h
@@
-62,7
+62,8
@@
struct nfs_fattr {
#define NFS_ATTR_FATTR 0x0002 /* post-op attributes */
#define NFS_ATTR_FATTR_V3 0x0004 /* NFSv3 attributes */
#define NFS_ATTR_FATTR_V4 0x0008 /* NFSv4 change attribute */
#define NFS_ATTR_FATTR 0x0002 /* post-op attributes */
#define NFS_ATTR_FATTR_V3 0x0004 /* NFSv3 attributes */
#define NFS_ATTR_FATTR_V4 0x0008 /* NFSv4 change attribute */
-#define NFS_ATTR_FATTR_V4_REFERRAL 0x0010 /* NFSv4 referral */
+#define NFS_ATTR_WCC_V4 0x0010 /* pre-op change attribute */
+#define NFS_ATTR_FATTR_V4_REFERRAL 0x0020 /* NFSv4 referral */
/*
* Info on the file system
/*
* Info on the file system
@@
-119,7
+120,7
@@
struct nfs_openargs {
struct nfs_seqid * seqid;
int open_flags;
__u64 clientid;
struct nfs_seqid * seqid;
int open_flags;
__u64 clientid;
- __u
32
id;
+ __u
64
id;
union {
struct iattr * attrs; /* UNCHECKED, GUARDED */
nfs4_verifier verifier; /* EXCLUSIVE */
union {
struct iattr * attrs; /* UNCHECKED, GUARDED */
nfs4_verifier verifier; /* EXCLUSIVE */
@@
-144,6
+145,7
@@
struct nfs_openres {
nfs4_stateid delegation;
__u32 do_recall;
__u64 maxsize;
nfs4_stateid delegation;
__u32 do_recall;
__u64 maxsize;
+ __u32 attrset[NFS4_BITMAP_SIZE];
};
/*
};
/*
@@
-180,7
+182,7
@@
struct nfs_closeres {
* */
struct nfs_lowner {
__u64 clientid;
* */
struct nfs_lowner {
__u64 clientid;
-
u32
id;
+
__u64
id;
};
struct nfs_lock_args {
};
struct nfs_lock_args {
@@
-276,6
+278,21
@@
struct nfs_writeres {
const struct nfs_server *server;
};
const struct nfs_server *server;
};
+/*
+ * Common arguments to the unlink call
+ */
+struct nfs_removeargs {
+ const struct nfs_fh *fh;
+ struct qstr name;
+ const u32 * bitmask;
+};
+
+struct nfs_removeres {
+ const struct nfs_server *server;
+ struct nfs4_change_info cinfo;
+ struct nfs_fattr dir_attr;
+};
+
/*
* Argument struct for decode_entry function
*/
/*
* Argument struct for decode_entry function
*/
@@
-522,10
+539,13
@@
typedef u64 clientid4;
struct nfs4_accessargs {
const struct nfs_fh * fh;
struct nfs4_accessargs {
const struct nfs_fh * fh;
+ const u32 * bitmask;
u32 access;
};
struct nfs4_accessres {
u32 access;
};
struct nfs4_accessres {
+ const struct nfs_server * server;
+ struct nfs_fattr * fattr;
u32 supported;
u32 access;
};
u32 supported;
u32 access;
};
@@
-630,18
+650,6
@@
struct nfs4_readlink {
struct page ** pages; /* zero-copy data */
};
struct page ** pages; /* zero-copy data */
};
-struct nfs4_remove_arg {
- const struct nfs_fh * fh;
- const struct qstr * name;
- const u32 * bitmask;
-};
-
-struct nfs4_remove_res {
- const struct nfs_server * server;
- struct nfs4_change_info cinfo;
- struct nfs_fattr * dir_attr;
-};
-
struct nfs4_rename_arg {
const struct nfs_fh * old_dir;
const struct nfs_fh * new_dir;
struct nfs4_rename_arg {
const struct nfs_fh * old_dir;
const struct nfs_fh * new_dir;
@@
-658,16
+666,17
@@
struct nfs4_rename_res {
struct nfs_fattr * new_fattr;
};
struct nfs_fattr * new_fattr;
};
+#define NFS4_SETCLIENTID_NAMELEN (56)
struct nfs4_setclientid {
struct nfs4_setclientid {
- const nfs4_verifier * sc_verifier;
/* request */
+ const nfs4_verifier * sc_verifier;
unsigned int sc_name_len;
unsigned int sc_name_len;
- char sc_name[
48]; /* request */
- u32 sc_prog;
/* request */
+ char sc_name[
NFS4_SETCLIENTID_NAMELEN];
+ u32 sc_prog;
unsigned int sc_netid_len;
unsigned int sc_netid_len;
- char sc_netid[
4]; /* request */
+ char sc_netid[
RPCBIND_MAXNETIDLEN];
unsigned int sc_uaddr_len;
unsigned int sc_uaddr_len;
- char sc_uaddr[
24]; /* request */
- u32 sc_cb_ident;
/* request */
+ char sc_uaddr[
RPCBIND_MAXUADDRLEN];
+ u32 sc_cb_ident;
};
struct nfs4_statfs_arg {
};
struct nfs4_statfs_arg {
@@
-765,7
+774,7
@@
struct nfs_access_entry;
* RPC procedure vector for NFSv2/NFSv3 demuxing
*/
struct nfs_rpc_ops {
* RPC procedure vector for NFSv2/NFSv3 demuxing
*/
struct nfs_rpc_ops {
-
int
version; /* Protocol version */
+
u32
version; /* Protocol version */
struct dentry_operations *dentry_ops;
const struct inode_operations *dir_inode_ops;
const struct inode_operations *file_inode_ops;
struct dentry_operations *dentry_ops;
const struct inode_operations *dir_inode_ops;
const struct inode_operations *file_inode_ops;
@@
-787,9
+796,8
@@
struct nfs_rpc_ops {
int (*create) (struct inode *, struct dentry *,
struct iattr *, int, struct nameidata *);
int (*remove) (struct inode *, struct qstr *);
int (*create) (struct inode *, struct dentry *,
struct iattr *, int, struct nameidata *);
int (*remove) (struct inode *, struct qstr *);
- int (*unlink_setup) (struct rpc_message *,
- struct dentry *, struct qstr *);
- int (*unlink_done) (struct dentry *, struct rpc_task *);
+ void (*unlink_setup) (struct rpc_message *, struct inode *dir);
+ int (*unlink_done) (struct rpc_task *, struct inode *);
int (*rename) (struct inode *, struct qstr *,
struct inode *, struct qstr *);
int (*link) (struct inode *, struct inode *, struct qstr *);
int (*rename) (struct inode *, struct qstr *,
struct inode *, struct qstr *);
int (*link) (struct inode *, struct inode *, struct qstr *);
@@
-809,11
+817,11
@@
struct nfs_rpc_ops {
struct nfs_pathconf *);
int (*set_capabilities)(struct nfs_server *, struct nfs_fh *);
__be32 *(*decode_dirent)(__be32 *, struct nfs_entry *, int plus);
struct nfs_pathconf *);
int (*set_capabilities)(struct nfs_server *, struct nfs_fh *);
__be32 *(*decode_dirent)(__be32 *, struct nfs_entry *, int plus);
- void (*read_setup) (struct nfs_read_data *);
+ void (*read_setup) (struct nfs_read_data *
, struct rpc_message *
);
int (*read_done) (struct rpc_task *, struct nfs_read_data *);
int (*read_done) (struct rpc_task *, struct nfs_read_data *);
- void (*write_setup) (struct nfs_write_data *,
int how
);
+ void (*write_setup) (struct nfs_write_data *,
struct rpc_message *
);
int (*write_done) (struct rpc_task *, struct nfs_write_data *);
int (*write_done) (struct rpc_task *, struct nfs_write_data *);
- void (*commit_setup) (struct nfs_write_data *,
int how
);
+ void (*commit_setup) (struct nfs_write_data *,
struct rpc_message *
);
int (*commit_done) (struct rpc_task *, struct nfs_write_data *);
int (*file_open) (struct inode *, struct file *);
int (*file_release) (struct inode *, struct file *);
int (*commit_done) (struct rpc_task *, struct nfs_write_data *);
int (*file_open) (struct inode *, struct file *);
int (*file_release) (struct inode *, struct file *);
This page took
0.027068 seconds
and
5
git commands to generate.