diff options
Diffstat (limited to 'include/linux')
-rw-r--r-- | include/linux/nfs_fs.h | 1 | ||||
-rw-r--r-- | include/linux/nfs_page.h | 6 |
2 files changed, 6 insertions, 1 deletions
diff --git a/include/linux/nfs_fs.h b/include/linux/nfs_fs.h index 4179c368844b..eddda6ce7c42 100644 --- a/include/linux/nfs_fs.h +++ b/include/linux/nfs_fs.h | |||
@@ -226,6 +226,7 @@ struct nfs_inode { | |||
226 | #define NFS_INO_FSCACHE (5) /* inode can be cached by FS-Cache */ | 226 | #define NFS_INO_FSCACHE (5) /* inode can be cached by FS-Cache */ |
227 | #define NFS_INO_FSCACHE_LOCK (6) /* FS-Cache cookie management lock */ | 227 | #define NFS_INO_FSCACHE_LOCK (6) /* FS-Cache cookie management lock */ |
228 | #define NFS_INO_COMMIT (7) /* inode is committing unstable writes */ | 228 | #define NFS_INO_COMMIT (7) /* inode is committing unstable writes */ |
229 | #define NFS_INO_PNFS_COMMIT (8) /* use pnfs code for commit */ | ||
229 | 230 | ||
230 | static inline struct nfs_inode *NFS_I(const struct inode *inode) | 231 | static inline struct nfs_inode *NFS_I(const struct inode *inode) |
231 | { | 232 | { |
diff --git a/include/linux/nfs_page.h b/include/linux/nfs_page.h index 92d54c81f51e..8023e4e25133 100644 --- a/include/linux/nfs_page.h +++ b/include/linux/nfs_page.h | |||
@@ -33,11 +33,15 @@ enum { | |||
33 | PG_CLEAN, | 33 | PG_CLEAN, |
34 | PG_NEED_COMMIT, | 34 | PG_NEED_COMMIT, |
35 | PG_NEED_RESCHED, | 35 | PG_NEED_RESCHED, |
36 | PG_PNFS_COMMIT, | ||
36 | }; | 37 | }; |
37 | 38 | ||
38 | struct nfs_inode; | 39 | struct nfs_inode; |
39 | struct nfs_page { | 40 | struct nfs_page { |
40 | struct list_head wb_list; /* Defines state of page: */ | 41 | union { |
42 | struct list_head wb_list; /* Defines state of page: */ | ||
43 | struct pnfs_layout_segment *wb_commit_lseg; /* Used when PG_PNFS_COMMIT set */ | ||
44 | }; | ||
41 | struct page *wb_page; /* page to read in/write out */ | 45 | struct page *wb_page; /* page to read in/write out */ |
42 | struct nfs_open_context *wb_context; /* File state context info */ | 46 | struct nfs_open_context *wb_context; /* File state context info */ |
43 | struct nfs_lock_context *wb_lock_context; /* lock context info */ | 47 | struct nfs_lock_context *wb_lock_context; /* lock context info */ |