NFS: create struct nfs_commit_info

It is COMMIT that is handled the most differently between
the paged and direct paths.  Create a structure that encapsulates
everything either path needs to know about the commit state.

We could use void to hide some of the layout driver stuff, but
Trond suggests pulling it out to ensure type checking, given the
huge changes being made, and the fact that it doesn't interfere
with other drivers.

Signed-off-by: Fred Isaman <iisaman@netapp.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>

1 files changed, 1 insertions, 13 deletions

diff --git a/fs/nfs/nfs4filelayout.h b/fs/nfs/nfs4filelayout.h
index 333a3ac97606..96b89bbddf4f 100644
--- a/fs/nfs/nfs4filelayout.h
+++ b/fs/nfs/nfs4filelayout.h
@@ -74,18 +74,6 @@ struct nfs4_file_layout_dsaddr {
         struct nfs4_pnfs_ds             *ds_list[1];
 };
 
-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 {
         struct pnfs_layout_segment generic_hdr;
         u32 stripe_type;
@@ -100,7 +88,7 @@ struct nfs4_filelayout_segment {
 
 struct nfs4_filelayout {
         struct pnfs_layout_hdr generic_hdr;
-        struct nfs4_fl_commit_info commit_info;
+        struct pnfs_ds_commit_info commit_info;
 };
 
 static inline struct nfs4_filelayout *