diff options
author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2007-06-17 15:10:24 -0400 |
---|---|---|
committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2007-07-10 23:40:26 -0400 |
commit | 9fd367f0f376ccfb2592eed9be0eece70429894f (patch) | |
tree | 9fa7b6570db80dd7025a5c33ebd7c82ca73698a7 /fs/nfs/write.c | |
parent | c03b40246123b2ced79e2620d1d2c089bb12369a (diff) |
NFS cleanup: Rename NFS_PAGE_TAG_WRITEBACK to NFS_PAGE_TAG_LOCKED
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs/write.c')
-rw-r--r-- | fs/nfs/write.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/fs/nfs/write.c b/fs/nfs/write.c index e9404328ac02..754066cc9146 100644 --- a/fs/nfs/write.c +++ b/fs/nfs/write.c | |||
@@ -289,7 +289,7 @@ static int nfs_page_async_flush(struct nfs_pageio_descriptor *pgio, | |||
289 | BUG(); | 289 | BUG(); |
290 | } | 290 | } |
291 | radix_tree_tag_set(&nfsi->nfs_page_tree, req->wb_index, | 291 | radix_tree_tag_set(&nfsi->nfs_page_tree, req->wb_index, |
292 | NFS_PAGE_TAG_WRITEBACK); | 292 | NFS_PAGE_TAG_LOCKED); |
293 | ret = test_bit(PG_NEED_FLUSH, &req->wb_flags); | 293 | ret = test_bit(PG_NEED_FLUSH, &req->wb_flags); |
294 | spin_unlock(req_lock); | 294 | spin_unlock(req_lock); |
295 | nfs_pageio_add_request(pgio, req); | 295 | nfs_pageio_add_request(pgio, req); |
@@ -524,7 +524,7 @@ static int nfs_wait_on_requests_locked(struct inode *inode, pgoff_t idx_start, u | |||
524 | idx_end = idx_start + npages - 1; | 524 | idx_end = idx_start + npages - 1; |
525 | 525 | ||
526 | next = idx_start; | 526 | next = idx_start; |
527 | while (radix_tree_gang_lookup_tag(&nfsi->nfs_page_tree, (void **)&req, next, 1, NFS_PAGE_TAG_WRITEBACK)) { | 527 | while (radix_tree_gang_lookup_tag(&nfsi->nfs_page_tree, (void **)&req, next, 1, NFS_PAGE_TAG_LOCKED)) { |
528 | if (req->wb_index > idx_end) | 528 | if (req->wb_index > idx_end) |
529 | break; | 529 | break; |
530 | 530 | ||
@@ -759,7 +759,7 @@ static void nfs_writepage_release(struct nfs_page *req) | |||
759 | nfs_inode_remove_request(req); | 759 | nfs_inode_remove_request(req); |
760 | } else | 760 | } else |
761 | nfs_end_page_writeback(req->wb_page); | 761 | nfs_end_page_writeback(req->wb_page); |
762 | nfs_clear_page_writeback(req); | 762 | nfs_clear_page_tag_locked(req); |
763 | } | 763 | } |
764 | 764 | ||
765 | static inline int flush_task_priority(int how) | 765 | static inline int flush_task_priority(int how) |
@@ -888,7 +888,7 @@ out_bad: | |||
888 | } | 888 | } |
889 | nfs_redirty_request(req); | 889 | nfs_redirty_request(req); |
890 | nfs_end_page_writeback(req->wb_page); | 890 | nfs_end_page_writeback(req->wb_page); |
891 | nfs_clear_page_writeback(req); | 891 | nfs_clear_page_tag_locked(req); |
892 | return -ENOMEM; | 892 | return -ENOMEM; |
893 | } | 893 | } |
894 | 894 | ||
@@ -931,7 +931,7 @@ static int nfs_flush_one(struct inode *inode, struct list_head *head, unsigned i | |||
931 | nfs_list_remove_request(req); | 931 | nfs_list_remove_request(req); |
932 | nfs_redirty_request(req); | 932 | nfs_redirty_request(req); |
933 | nfs_end_page_writeback(req->wb_page); | 933 | nfs_end_page_writeback(req->wb_page); |
934 | nfs_clear_page_writeback(req); | 934 | nfs_clear_page_tag_locked(req); |
935 | } | 935 | } |
936 | return -ENOMEM; | 936 | return -ENOMEM; |
937 | } | 937 | } |
@@ -1049,7 +1049,7 @@ remove_request: | |||
1049 | nfs_end_page_writeback(page); | 1049 | nfs_end_page_writeback(page); |
1050 | nfs_inode_remove_request(req); | 1050 | nfs_inode_remove_request(req); |
1051 | next: | 1051 | next: |
1052 | nfs_clear_page_writeback(req); | 1052 | nfs_clear_page_tag_locked(req); |
1053 | } | 1053 | } |
1054 | } | 1054 | } |
1055 | 1055 | ||
@@ -1212,7 +1212,7 @@ nfs_commit_list(struct inode *inode, struct list_head *head, int how) | |||
1212 | nfs_list_remove_request(req); | 1212 | nfs_list_remove_request(req); |
1213 | nfs_mark_request_commit(req); | 1213 | nfs_mark_request_commit(req); |
1214 | dec_zone_page_state(req->wb_page, NR_UNSTABLE_NFS); | 1214 | dec_zone_page_state(req->wb_page, NR_UNSTABLE_NFS); |
1215 | nfs_clear_page_writeback(req); | 1215 | nfs_clear_page_tag_locked(req); |
1216 | } | 1216 | } |
1217 | return -ENOMEM; | 1217 | return -ENOMEM; |
1218 | } | 1218 | } |
@@ -1265,7 +1265,7 @@ static void nfs_commit_done(struct rpc_task *task, void *calldata) | |||
1265 | dprintk(" mismatch\n"); | 1265 | dprintk(" mismatch\n"); |
1266 | nfs_redirty_request(req); | 1266 | nfs_redirty_request(req); |
1267 | next: | 1267 | next: |
1268 | nfs_clear_page_writeback(req); | 1268 | nfs_clear_page_tag_locked(req); |
1269 | } | 1269 | } |
1270 | } | 1270 | } |
1271 | 1271 | ||