tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

NFS: Ensure PG_writeback is cleared when writeback fails

If the writebacks are cancelled via nfs_cancel_dirty_list, or due to the
memory allocation failing in nfs_flush_one/nfs_flush_multi, then we must
ensure that the PG_writeback flag is cleared.

Also ensure that we actually own the PG_writeback flag whenever we
schedule a new writeback by making nfs_set_page_writeback() return the
value of test_set_page_writeback().
The PG_writeback page flag ends up replacing the functionality of the
PG_FLUSHING nfs_page flag, so we rip that out too.

Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by

Trond Myklebust and committed by
Linus Torvalds 5a6d41b3 60fa3f76

+15 -8
+15 -7
fs/nfs/write.c
··· 218 218 #define NFS_CONGESTION_OFF_THRESH \ 219 219 (NFS_CONGESTION_ON_THRESH - (NFS_CONGESTION_ON_THRESH >> 2)) 220 220 221 - static void nfs_set_page_writeback(struct page *page) 221 + static int nfs_set_page_writeback(struct page *page) 222 222 { 223 - if (!test_set_page_writeback(page)) { 223 + int ret = test_set_page_writeback(page); 224 + 225 + if (!ret) { 224 226 struct inode *inode = page->mapping->host; 225 227 struct nfs_server *nfss = NFS_SERVER(inode); 226 228 ··· 230 228 NFS_CONGESTION_ON_THRESH) 231 229 set_bdi_congested(&nfss->backing_dev_info, WRITE); 232 230 } 231 + return ret; 233 232 } 234 233 235 234 static void nfs_end_page_writeback(struct page *page) ··· 280 277 spin_lock(req_lock); 281 278 } 282 279 spin_unlock(req_lock); 283 - if (test_and_set_bit(PG_FLUSHING, &req->wb_flags) == 0) { 280 + if (nfs_set_page_writeback(page) == 0) 284 281 nfs_mark_request_dirty(req); 285 - nfs_set_page_writeback(page); 286 - } 287 282 ret = test_bit(PG_NEED_FLUSH, &req->wb_flags); 288 283 nfs_unlock_request(req); 289 284 return ret; ··· 425 424 static void 426 425 nfs_redirty_request(struct nfs_page *req) 427 426 { 428 - clear_bit(PG_FLUSHING, &req->wb_flags); 429 427 __set_page_dirty_nobuffers(req->wb_page); 430 428 } 431 429 ··· 434 434 static inline int 435 435 nfs_dirty_request(struct nfs_page *req) 436 436 { 437 - return test_bit(PG_FLUSHING, &req->wb_flags) == 0; 437 + struct page *page = req->wb_page; 438 + 439 + if (page == NULL) 440 + return 0; 441 + return !PageWriteback(req->wb_page); 438 442 } 439 443 440 444 #if defined(CONFIG_NFS_V3) || defined(CONFIG_NFS_V4) ··· 504 500 while(!list_empty(head)) { 505 501 req = nfs_list_entry(head->next); 506 502 nfs_list_remove_request(req); 503 + nfs_end_page_writeback(req->wb_page); 507 504 nfs_inode_remove_request(req); 508 505 nfs_clear_page_writeback(req); 509 506 } ··· 895 890 list_del(&data->pages); 896 891 nfs_writedata_release(data); 897 892 } 893 + nfs_end_page_writeback(req->wb_page); 898 894 nfs_redirty_request(req); 899 895 nfs_clear_page_writeback(req); 900 896 return -ENOMEM; ··· 941 935 while (!list_empty(head)) { 942 936 struct nfs_page *req = nfs_list_entry(head->next); 943 937 nfs_list_remove_request(req); 938 + nfs_end_page_writeback(req->wb_page); 944 939 nfs_redirty_request(req); 945 940 nfs_clear_page_writeback(req); 946 941 } ··· 977 970 while (!list_empty(head)) { 978 971 req = nfs_list_entry(head->next); 979 972 nfs_list_remove_request(req); 973 + nfs_end_page_writeback(req->wb_page); 980 974 nfs_redirty_request(req); 981 975 nfs_clear_page_writeback(req); 982 976 }
-1
include/linux/nfs_page.h
··· 31 31 #define PG_NEED_COMMIT 1 32 32 #define PG_NEED_RESCHED 2 33 33 #define PG_NEED_FLUSH 3 34 - #define PG_FLUSHING 4 35 34 36 35 struct nfs_inode; 37 36 struct nfs_page {