1 files changed, 3 insertions, 3 deletions

diff --git a/fs/nfs/file.c b/fs/nfs/file.c
index 37f639d50af5..93e236429c5d 100644
--- a/fs/nfs/file.c
+++ b/fs/nfs/file.c
@@ -473,8 +473,8 @@ static int nfs_release_page(struct page *page, gfp_t gfp)
         dfprintk(PAGECACHE, "NFS: release_page(%p)\n", page);
 
         /* Always try to initiate a 'commit' if relevant, but only
-         * wait for it if __GFP_WAIT is set.  Even then, only wait 1
-         * second and only if the 'bdi' is not congested.
+         * wait for it if the caller allows blocking.  Even then,
+         * only wait 1 second and only if the 'bdi' is not congested.
          * Waiting indefinitely can cause deadlocks when the NFS
          * server is on this machine, when a new TCP connection is
          * needed and in other rare cases.  There is no particular
@@ -484,7 +484,7 @@ static int nfs_release_page(struct page *page, gfp_t gfp)
         if (mapping) {
                 struct nfs_server *nfss = NFS_SERVER(mapping->host);
                 nfs_commit_inode(mapping->host, 0);
-                if ((gfp & __GFP_WAIT) &&
+                if (gfpflags_allow_blocking(gfp) &&
                     !bdi_write_congested(&nfss->backing_dev_info)) {
                         wait_on_page_bit_killable_timeout(page, PG_private,
                                                           HZ);