1 files changed, 18 insertions, 2 deletions

diff --git a/fs/nfs/nfs4filelayout.h b/fs/nfs/nfs4filelayout.h
index 21190bb1f5e3..333a3ac97606 100644
--- a/fs/nfs/nfs4filelayout.h
+++ b/fs/nfs/nfs4filelayout.h
@@ -77,6 +77,13 @@ struct nfs4_file_layout_dsaddr {
 struct nfs4_fl_commit_bucket {
         struct list_head written;
         struct list_head committing;
+        struct pnfs_layout_segment *wlseg;
+        struct pnfs_layout_segment *clseg;
+};
+
+struct nfs4_fl_commit_info {
+        int nbuckets;
+        struct nfs4_fl_commit_bucket *buckets;
 };
 
 struct nfs4_filelayout_segment {
@@ -89,10 +96,19 @@ struct nfs4_filelayout_segment {
         struct nfs4_file_layout_dsaddr *dsaddr; /* Point to GETDEVINFO data */
         unsigned int num_fh;
         struct nfs_fh **fh_array;
-        struct nfs4_fl_commit_bucket *commit_buckets; /* Sort commits to ds */
-        int number_of_buckets;
 };
 
+struct nfs4_filelayout {
+        struct pnfs_layout_hdr generic_hdr;
+        struct nfs4_fl_commit_info commit_info;
+};
+
+static inline struct nfs4_filelayout *
+FILELAYOUT_FROM_HDR(struct pnfs_layout_hdr *lo)
+{
+        return container_of(lo, struct nfs4_filelayout, generic_hdr);
+}
+
 static inline struct nfs4_filelayout_segment *
 FILELAYOUT_LSEG(struct pnfs_layout_segment *lseg)
 {