Skip to contentSkip to conversation

nfs: Clean up the handling of unstable pages

PATCH New Tom Haynes 1 participant 3 messages Feb 13, 2015

Subsystems (2)
lore
Share & tools
lore

Tom Haynes

author
#0 lore raw

v2 cover nfs: Clean up the handling of unstable pages

The following patches refactor the marking of pages as unstable and make sure that we use nfs_clear_page_commit() all places it can be used.

Note that these are applied to Linus' master branch as the impetus sprung from the mismerge with the bdi changes.

Difference from V1:
- Split patch into logical set of changes

Tom Haynes (2):
nfs: Provide and use helper functions for marking a page as unstable
nfs: Can call nfs_clear_page_commit() instead

 fs/nfs/filelayout/filelayout.c         |  9 ++-------
 fs/nfs/flexfilelayout/flexfilelayout.c |  9 ++-------
 fs/nfs/internal.h                      | 13 +++++++++++++
 fs/nfs/write.c                         | 16 ++++------------
 4 files changed, 21 insertions(+), 26 deletions(-)
Signature · 1 line
1.9.3
author
#1 lore raw

PATCH v2 1/2 nfs: Provide and use helper functions for marking a page as unstable

---
 fs/nfs/filelayout/filelayout.c         |  9 ++-------
 fs/nfs/flexfilelayout/flexfilelayout.c |  9 ++-------
 fs/nfs/internal.h                      | 13 +++++++++++++
 fs/nfs/write.c                         |  9 ++-------
 4 files changed, 19 insertions(+), 21 deletions(-)
fs/nfs/filelayout/filelayout.c +2 -7
index 7ae1c26..e1e5ea2 100644
@@ -1000,13 +1000,8 @@ mds_commit:
 	nfs_list_add_request(req, list);
 	cinfo->mds->ncommit++;
 	spin_unlock(cinfo->lock);
-	if (!cinfo->dreq) {
-		inc_zone_page_state(req->wb_page, NR_UNSTABLE_NFS);
-		inc_bdi_stat(inode_to_bdi(page_file_mapping(req->wb_page)->host),
-			     BDI_RECLAIMABLE);
-		__mark_inode_dirty(req->wb_context->dentry->d_inode,
-				   I_DIRTY_DATASYNC);
-	}
+	if (!cinfo->dreq)
+		nfs_mark_page_unstable(req->wb_page);
 }
 
 static u32 calc_ds_index_from_commit(struct pnfs_layout_segment *lseg, u32 i)
fs/nfs/flexfilelayout/flexfilelayout.c +2 -7
index c22ecaa..423c2bc 100644
@@ -1364,13 +1364,8 @@ ff_layout_mark_request_commit(struct nfs_page *req,
 	nfs_list_add_request(req, list);
 	cinfo->mds->ncommit++;
 	spin_unlock(cinfo->lock);
-	if (!cinfo->dreq) {
-		inc_zone_page_state(req->wb_page, NR_UNSTABLE_NFS);
-		inc_bdi_stat(inode_to_bdi(page_file_mapping(req->wb_page)->host),
-			     BDI_RECLAIMABLE);
-		__mark_inode_dirty(req->wb_context->dentry->d_inode,
-				   I_DIRTY_DATASYNC);
-	}
+	if (!cinfo->dreq)
+		nfs_mark_page_unstable(req->wb_page);
 }
 
 static u32 calc_ds_index_from_commit(struct pnfs_layout_segment *lseg, u32 i)
fs/nfs/internal.h +13 -0
index 212b8c8..b802fb3 100644
@@ -598,6 +598,19 @@ void nfs_super_set_maxbytes(struct super_block *sb, __u64 maxfilesize)
 }
 
 /*
+ * Record the page as unstable and mark its inode as dirty.
+ */
+static inline
+void nfs_mark_page_unstable(struct page *page)
+{
+	struct inode *inode = page_file_mapping(page)->host;
+
+	inc_zone_page_state(page, NR_UNSTABLE_NFS);
+	inc_bdi_stat(inode_to_bdi(inode), BDI_RECLAIMABLE);
+	 __mark_inode_dirty(inode, I_DIRTY_DATASYNC);
+}
+
+/*
  * Determine the number of bytes of data the page contains
  */
 static inline
fs/nfs/write.c +2 -7
index 88a6d21..76c278a 100644
@@ -789,13 +789,8 @@ nfs_request_add_commit_list(struct nfs_page *req, struct list_head *dst,
 	nfs_list_add_request(req, dst);
 	cinfo->mds->ncommit++;
 	spin_unlock(cinfo->lock);
-	if (!cinfo->dreq) {
-		inc_zone_page_state(req->wb_page, NR_UNSTABLE_NFS);
-		inc_bdi_stat(inode_to_bdi(page_file_mapping(req->wb_page)->host),
-			     BDI_RECLAIMABLE);
-		__mark_inode_dirty(req->wb_context->dentry->d_inode,
-				   I_DIRTY_DATASYNC);
-	}
+	if (!cinfo->dreq)
+		nfs_mark_page_unstable(req->wb_page);
 }
 EXPORT_SYMBOL_GPL(nfs_request_add_commit_list);
 
Signature · 1 line
1.9.3
author
#2 lore raw

PATCH v2 2/2 nfs: Can call nfs_clear_page_commit() instead

In reply to Tom Haynes
---
 fs/nfs/write.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)
fs/nfs/write.c +2 -5
index 76c278a..595d81e 100644
@@ -1600,11 +1600,8 @@ void nfs_retry_commit(struct list_head *page_list,
 		req = nfs_list_entry(page_list->next);
 		nfs_list_remove_request(req);
 		nfs_mark_request_commit(req, lseg, cinfo, ds_commit_idx);
-		if (!cinfo->dreq) {
-			dec_zone_page_state(req->wb_page, NR_UNSTABLE_NFS);
-			dec_bdi_stat(inode_to_bdi(page_file_mapping(req->wb_page)->host),
-				     BDI_RECLAIMABLE);
-		}
+		if (!cinfo->dreq)
+			nfs_clear_page_commit(req->wb_page);
 		nfs_unlock_and_release_request(req);
 	}
 }
Signature · 1 line
1.9.3