diff options
Diffstat (limited to 'fs/nfs/pagelist.c')
-rw-r--r-- | fs/nfs/pagelist.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/fs/nfs/pagelist.c b/fs/nfs/pagelist.c index 257a7f8b2362..23e9dea20902 100644 --- a/fs/nfs/pagelist.c +++ b/fs/nfs/pagelist.c | |||
@@ -108,29 +108,29 @@ void nfs_unlock_request(struct nfs_page *req) | |||
108 | } | 108 | } |
109 | 109 | ||
110 | /** | 110 | /** |
111 | * nfs_set_page_writeback_locked - Lock a request for writeback | 111 | * nfs_set_page_tag_locked - Tag a request as locked |
112 | * @req: | 112 | * @req: |
113 | */ | 113 | */ |
114 | int nfs_set_page_writeback_locked(struct nfs_page *req) | 114 | static int nfs_set_page_tag_locked(struct nfs_page *req) |
115 | { | 115 | { |
116 | struct nfs_inode *nfsi = NFS_I(req->wb_context->path.dentry->d_inode); | 116 | struct nfs_inode *nfsi = NFS_I(req->wb_context->path.dentry->d_inode); |
117 | 117 | ||
118 | if (!nfs_lock_request(req)) | 118 | if (!nfs_lock_request(req)) |
119 | return 0; | 119 | return 0; |
120 | radix_tree_tag_set(&nfsi->nfs_page_tree, req->wb_index, NFS_PAGE_TAG_WRITEBACK); | 120 | radix_tree_tag_set(&nfsi->nfs_page_tree, req->wb_index, NFS_PAGE_TAG_LOCKED); |
121 | return 1; | 121 | return 1; |
122 | } | 122 | } |
123 | 123 | ||
124 | /** | 124 | /** |
125 | * nfs_clear_page_writeback - Unlock request and wake up sleepers | 125 | * nfs_clear_page_tag_locked - Clear request tag and wake up sleepers |
126 | */ | 126 | */ |
127 | void nfs_clear_page_writeback(struct nfs_page *req) | 127 | void nfs_clear_page_tag_locked(struct nfs_page *req) |
128 | { | 128 | { |
129 | struct nfs_inode *nfsi = NFS_I(req->wb_context->path.dentry->d_inode); | 129 | struct nfs_inode *nfsi = NFS_I(req->wb_context->path.dentry->d_inode); |
130 | 130 | ||
131 | if (req->wb_page != NULL) { | 131 | if (req->wb_page != NULL) { |
132 | spin_lock(&nfsi->req_lock); | 132 | spin_lock(&nfsi->req_lock); |
133 | radix_tree_tag_clear(&nfsi->nfs_page_tree, req->wb_index, NFS_PAGE_TAG_WRITEBACK); | 133 | radix_tree_tag_clear(&nfsi->nfs_page_tree, req->wb_index, NFS_PAGE_TAG_LOCKED); |
134 | spin_unlock(&nfsi->req_lock); | 134 | spin_unlock(&nfsi->req_lock); |
135 | } | 135 | } |
136 | nfs_unlock_request(req); | 136 | nfs_unlock_request(req); |
@@ -421,7 +421,7 @@ int nfs_scan_list(struct nfs_inode *nfsi, struct list_head *head, | |||
421 | idx_start = req->wb_index + 1; | 421 | idx_start = req->wb_index + 1; |
422 | if (req->wb_list_head != head) | 422 | if (req->wb_list_head != head) |
423 | continue; | 423 | continue; |
424 | if (nfs_set_page_writeback_locked(req)) { | 424 | if (nfs_set_page_tag_locked(req)) { |
425 | nfs_list_remove_request(req); | 425 | nfs_list_remove_request(req); |
426 | nfs_list_add_request(req, dst); | 426 | nfs_list_add_request(req, dst); |
427 | res++; | 427 | res++; |