NFS: Remove the redundant 'dirty' and 'commit' lists from nfs_inode

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

2 files changed, 2 insertions, 8 deletions

diff --git a/include/linux/nfs_fs.h b/include/linux/nfs_fs.h
index 07eea8f64ecf..a94205476736 100644
--- a/include/linux/nfs_fs.h
+++ b/include/linux/nfs_fs.h
@@ -156,12 +156,9 @@ struct nfs_inode {
          * This is the list of dirty unwritten pages.
          */
         spinlock_t              req_lock;
-        struct list_head        dirty;
-        struct list_head        commit;
         struct radix_tree_root  nfs_page_tree;
 
-        unsigned int            ndirty,
-                                ncommit,
+        unsigned int            ncommit,
                                 npages;
 
         /* Open contexts for shared mmap writes */
diff --git a/include/linux/nfs_page.h b/include/linux/nfs_page.h
index 481a42105d69..78e60798d10e 100644
--- a/include/linux/nfs_page.h
+++ b/include/linux/nfs_page.h
@@ -34,8 +34,7 @@
 
 struct nfs_inode;
 struct nfs_page {
-        struct list_head        wb_list,        /* Defines state of page: */
-                                *wb_list_head;  /*      read/write/commit */
+        struct list_head        wb_list;        /* Defines state of page: */
         struct page             *wb_page;       /* page to read in/write out */
         struct nfs_open_context *wb_context;    /* File state context info */
         atomic_t                wb_complete;    /* i/os we're waiting for */
@@ -118,7 +117,6 @@ static inline void
 nfs_list_add_request(struct nfs_page *req, struct list_head *head)
 {
         list_add_tail(&req->wb_list, head);
-        req->wb_list_head = head;
 }
 
 
@@ -132,7 +130,6 @@ nfs_list_remove_request(struct nfs_page *req)
         if (list_empty(&req->wb_list))
                 return;
         list_del_init(&req->wb_list);
-        req->wb_list_head = NULL;
 }
 
 static inline struct nfs_page *