The existance of req->wb_lseg can take the place of PG_USE_PNFS
This reverts commit 447b65adcc53ab21e76ce8795827df7d4c165af1.
Signed-off-by: Fred Isaman <iisaman@xxxxxxxxxx>
---
fs/nfs/pnfs.h | 9 ---------
fs/nfs/write.c | 2 +-
include/linux/nfs_page.h | 1 -
3 files changed, 1 insertions(+), 11 deletions(-)
diff --git a/fs/nfs/pnfs.h b/fs/nfs/pnfs.h
index 09de7a3..541e3fd 100644
--- a/fs/nfs/pnfs.h
+++ b/fs/nfs/pnfs.h
@@ -154,11 +154,6 @@ pnfs_try_to_commit(struct nfs_write_data *data,
return ret;
}
-static inline void pnfs_redirty_request(struct nfs_page *req)
-{
- clear_bit(PG_USE_PNFS, &req->wb_flags);
-}
-
static inline int pnfs_return_layout(struct inode *ino,
struct nfs4_pnfs_layout_segment *lseg,
const nfs4_stateid *stateid, /* optional */
@@ -248,10 +243,6 @@ pnfs_try_to_commit(struct nfs_write_data *data,
return PNFS_NOT_ATTEMPTED;
}
-static inline void pnfs_redirty_request(struct nfs_page *req)
-{
-}
-
static inline int pnfs_get_write_status(struct nfs_write_data *data)
{
return 0;
diff --git a/fs/nfs/write.c b/fs/nfs/write.c
index f1e4120..65e2c62 100644
--- a/fs/nfs/write.c
+++ b/fs/nfs/write.c
@@ -903,7 +903,7 @@ static void nfs_redirty_request(struct nfs_page *req)
{
struct page *page = req->wb_page;
- pnfs_redirty_request(req);
+ nfs_mark_request_nopnfs(req);
nfs_mark_request_dirty(req);
nfs_clear_page_tag_locked(req);
nfs_end_page_writeback(page);
diff --git a/include/linux/nfs_page.h b/include/linux/nfs_page.h
index 06e5157..7709d3e 100644
--- a/include/linux/nfs_page.h
+++ b/include/linux/nfs_page.h
@@ -32,7 +32,6 @@ enum {
PG_CLEAN,
PG_NEED_COMMIT,
PG_NEED_RESCHED,
- PG_USE_PNFS,
};
struct nfs_inode;
--
1.6.6.1
--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
