]> git.baikalelectronics.ru Git - kernel.git/commitdiff
nfs: no PG_private waiters remain, remove waker
authorNicholas Piggin <npiggin@gmail.com>
Wed, 22 Feb 2017 23:44:39 +0000 (15:44 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 23 Feb 2017 00:41:29 +0000 (16:41 -0800)
Since commit 4f52b6bb8c57 ("NFS: Don't call COMMIT in ->releasepage()"),
no tasks wait on PagePrivate.

Thus the wake introduced in commit 9590544694be ("NFS: avoid deadlocks
with loop-back mounted NFS filesystems.") can be removed.

Link: http://lkml.kernel.org/r/20170103182234.30141-2-npiggin@gmail.com
Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
Cc: Trond Myklebust <trond.myklebust@primarydata.com>
Cc: Anna Schumaker <anna.schumaker@netapp.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
fs/nfs/write.c

index b00d53d13d47622f00343d8b599a8f182fb6854c..006068526542760358b8450d76a8bf9e62f4f216 100644 (file)
@@ -728,8 +728,6 @@ static void nfs_inode_remove_request(struct nfs_page *req)
                if (likely(head->wb_page && !PageSwapCache(head->wb_page))) {
                        set_page_private(head->wb_page, 0);
                        ClearPagePrivate(head->wb_page);
-                       smp_mb__after_atomic();
-                       wake_up_page(head->wb_page, PG_private);
                        clear_bit(PG_MAPPED, &head->wb_flags);
                }
                nfsi->nrequests--;