diff options
Diffstat (limited to 'include/linux/nfs_fs.h')
-rw-r--r-- | include/linux/nfs_fs.h | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/include/linux/nfs_fs.h b/include/linux/nfs_fs.h index 4b03f56e280e..334a2f5f6bf1 100644 --- a/include/linux/nfs_fs.h +++ b/include/linux/nfs_fs.h | |||
@@ -81,12 +81,16 @@ struct nfs_access_entry { | |||
81 | int mask; | 81 | int mask; |
82 | }; | 82 | }; |
83 | 83 | ||
84 | struct nfs_lockowner { | ||
85 | fl_owner_t l_owner; | ||
86 | pid_t l_pid; | ||
87 | }; | ||
88 | |||
84 | struct nfs_lock_context { | 89 | struct nfs_lock_context { |
85 | atomic_t count; | 90 | atomic_t count; |
86 | struct list_head list; | 91 | struct list_head list; |
87 | struct nfs_open_context *open_context; | 92 | struct nfs_open_context *open_context; |
88 | fl_owner_t lockowner; | 93 | struct nfs_lockowner lockowner; |
89 | pid_t pid; | ||
90 | }; | 94 | }; |
91 | 95 | ||
92 | struct nfs4_state; | 96 | struct nfs4_state; |
@@ -99,6 +103,7 @@ struct nfs_open_context { | |||
99 | 103 | ||
100 | unsigned long flags; | 104 | unsigned long flags; |
101 | #define NFS_CONTEXT_ERROR_WRITE (0) | 105 | #define NFS_CONTEXT_ERROR_WRITE (0) |
106 | #define NFS_CONTEXT_RESEND_WRITES (1) | ||
102 | int error; | 107 | int error; |
103 | 108 | ||
104 | struct list_head list; | 109 | struct list_head list; |
@@ -355,6 +360,8 @@ extern int nfs_refresh_inode(struct inode *, struct nfs_fattr *); | |||
355 | extern int nfs_post_op_update_inode(struct inode *inode, struct nfs_fattr *fattr); | 360 | extern int nfs_post_op_update_inode(struct inode *inode, struct nfs_fattr *fattr); |
356 | extern int nfs_post_op_update_inode_force_wcc(struct inode *inode, struct nfs_fattr *fattr); | 361 | extern int nfs_post_op_update_inode_force_wcc(struct inode *inode, struct nfs_fattr *fattr); |
357 | extern int nfs_getattr(struct vfsmount *, struct dentry *, struct kstat *); | 362 | extern int nfs_getattr(struct vfsmount *, struct dentry *, struct kstat *); |
363 | extern void nfs_access_add_cache(struct inode *, struct nfs_access_entry *); | ||
364 | extern void nfs_access_set_mask(struct nfs_access_entry *, u32); | ||
358 | extern int nfs_permission(struct inode *, int); | 365 | extern int nfs_permission(struct inode *, int); |
359 | extern int nfs_open(struct inode *, struct file *); | 366 | extern int nfs_open(struct inode *, struct file *); |
360 | extern int nfs_release(struct inode *, struct file *); | 367 | extern int nfs_release(struct inode *, struct file *); |