On Wed, 4 Jan 2017 13:43:10 +0000 Trond Myklebust <trondmy@xxxxxxxxxxxxxxx> wrote: > Hi Nick, > > > On Jan 3, 2017, at 13:22, Nicholas Piggin <npiggin@xxxxxxxxx> wrote: > > > > Since commit 4f52b6bb ("NFS: Don't call COMMIT in ->releasepage()"), > > no tasks wait on PagePrivate, so the wake introduced in commit 95905446 > > ("NFS: avoid deadlocks with loop-back mounted NFS filesystems.") can > > be removed. > > > > Signed-off-by: Nicholas Piggin <npiggin@xxxxxxxxx> > > --- > > fs/nfs/write.c | 2 -- > > 1 file changed, 2 deletions(-) > > > > diff --git a/fs/nfs/write.c b/fs/nfs/write.c > > index b00d53d13d47..006068526542 100644 > > --- a/fs/nfs/write.c > > +++ b/fs/nfs/write.c > > @@ -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--; > > -- > > 2.11.0 > > > > That looks fine to me. Do you want to push it through the linux-mm path or do you want me to take it? Hi Trond, Thanks. I don't see a problem with both patches going through your tree. I think the patches to add this stuff went through your tree as well. The removal of the export is really the only thing that makes patch 2 non-trivial, but considering it was added for NFS, I think it's safe to remove. Thanks, Nick -- 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