SUNRPC: Remove redundant __GFP_NOWARN

GFP_NOWAIT already includes __GFP_NOWARN, so let's remove the redundant
__GFP_NOWARN.

Signed-off-by: Qianfeng Rong <rongqianfeng@vivo.com>
Acked-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Anna Schumaker <anna.schumaker@oracle.com>

diff --git a/net/sunrpc/socklib.c b/net/sunrpc/socklib.c
index 4e92e2a5016843b6060614f23dce9e4cdae680a3..d8d8842c7de5cd18ab07671f99c90946effff35f 100644 (file)
--- a/net/sunrpc/socklib.c
+++ b/net/sunrpc/socklib.c
@@ -86,7 +86,7 @@ xdr_partial_copy_from_skb(struct xdr_buf *xdr, struct xdr_skb_reader *desc)
                /* ACL likes to be lazy in allocating pages - ACLs
                 * are small by default but can get huge. */
                if ((xdr->flags & XDRBUF_SPARSE_PAGES) && *ppage == NULL) {
-                       *ppage = alloc_page(GFP_NOWAIT | __GFP_NOWARN);
+                       *ppage = alloc_page(GFP_NOWAIT);
                        if (unlikely(*ppage == NULL)) {
                                if (copied == 0)
                                        return -ENOMEM;

diff --git a/net/sunrpc/xprtrdma/rpc_rdma.c b/net/sunrpc/xprtrdma/rpc_rdma.c
index 1478c41c7e9da7775b22f0bb4c45d44ed8263820..3aac1456e23e5389fc720c116f33127053ffbc87 100644 (file)
--- a/net/sunrpc/xprtrdma/rpc_rdma.c
+++ b/net/sunrpc/xprtrdma/rpc_rdma.c
@@ -190,7 +190,7 @@ rpcrdma_alloc_sparse_pages(struct xdr_buf *buf)
        ppages = buf->pages + (buf->page_base >> PAGE_SHIFT);
        while (len > 0) {
                if (!*ppages)
-                       *ppages = alloc_page(GFP_NOWAIT | __GFP_NOWARN);
+                       *ppages = alloc_page(GFP_NOWAIT);
                if (!*ppages)
                        return -ENOBUFS;
                ppages++;