[pnfs] [PATCH 03/32] pnfs: rename nfs_retry_request

[Fred Isaman]

Update previous patch creating nfs_retry_request to match upstream
contribution as modified by Trond's sugestions

Signed-off-by: Fred Isaman <iisaman at citi.umich.edu>
---
 fs/nfs/write.c |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/fs/nfs/write.c b/fs/nfs/write.c
index fa7fc2b..bbca2f9 100644
--- a/fs/nfs/write.c
+++ b/fs/nfs/write.c
@@ -418,7 +418,7 @@ static void nfs_inode_remove_request(struct nfs_page *req)
 }
 
 static void
-nfs_redirty_request(struct nfs_page *req)
+nfs_mark_request_dirty(struct nfs_page *req)
 {
 	__set_page_dirty_nobuffers(req->wb_page);
 }
@@ -472,7 +472,7 @@ int nfs_reschedule_unstable_write(struct nfs_page *req)
 		return 1;
 	}
 	if (test_and_clear_bit(PG_NEED_RESCHED, &req->wb_flags)) {
-		nfs_redirty_request(req);
+		nfs_mark_request_dirty(req);
 		return 1;
 	}
 	return 0;
@@ -867,9 +867,9 @@ void nfs_initiate_write(struct nfs_write_data *data,
  * call this on each, which will prepare them to be retried on next
  * writeback using standard nfs.
  */
-static void nfs_retry_request(struct nfs_page *req)
+static void nfs_redirty_request(struct nfs_page *req)
 {
-	nfs_redirty_request(req);
+	nfs_mark_request_dirty(req);
 	nfs_end_page_writeback(req->wb_page);
 	nfs_clear_page_tag_locked(req);
 }
@@ -933,7 +933,7 @@ out_bad:
 		list_del(&data->pages);
 		nfs_writedata_release(data);
 	}
-	nfs_retry_request(req);
+	nfs_redirty_request(req);
 	return -ENOMEM;
 }
 
@@ -979,7 +979,7 @@ int nfs_flush_one(struct inode *inode, struct list_head *head,
 	while (!list_empty(head)) {
 		req = nfs_list_entry(head->next);
 		nfs_list_remove_request(req);
-		nfs_retry_request(req);
+		nfs_redirty_request(req);
 	}
 	return -ENOMEM;
 }
@@ -1374,7 +1374,7 @@ static void nfs_commit_done(struct rpc_task *task, void *calldata)
 		}
 		/* We have a mismatch. Write the page again */
 		dprintk(" mismatch\n");
-		nfs_redirty_request(req);
+		nfs_mark_request_dirty(req);
 	next:
 		nfs_clear_page_tag_locked(req);
 	}
-- 
1.5.3.3