From f8b1c4a8d83cbb80222e4b51cc55f37b5a9087de Mon Sep 17 00:00:00 2001 From: NeilBrown Date: Fri, 2 Mar 2018 10:31:25 +1100 Subject: [PATCH] staging: lustre: ptlrpc: change GFP_NOFS to GFP_KERNEL These allocations are performed during initialization, so they don't need GFP_NOFS. Signed-off-by: NeilBrown Signed-off-by: Greg Kroah-Hartman --- drivers/staging/lustre/lustre/ptlrpc/sec_bulk.c | 2 +- drivers/staging/lustre/lustre/ptlrpc/service.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/staging/lustre/lustre/ptlrpc/sec_bulk.c b/drivers/staging/lustre/lustre/ptlrpc/sec_bulk.c index 577c5822..625b952 100644 --- a/drivers/staging/lustre/lustre/ptlrpc/sec_bulk.c +++ b/drivers/staging/lustre/lustre/ptlrpc/sec_bulk.c @@ -377,7 +377,7 @@ static inline void enc_pools_alloc(void) page_pools.epp_pools = kvzalloc(page_pools.epp_max_pools * sizeof(*page_pools.epp_pools), - GFP_NOFS); + GFP_KERNEL); } static inline void enc_pools_free(void) diff --git a/drivers/staging/lustre/lustre/ptlrpc/service.c b/drivers/staging/lustre/lustre/ptlrpc/service.c index 4941722..f37364e 100644 --- a/drivers/staging/lustre/lustre/ptlrpc/service.c +++ b/drivers/staging/lustre/lustre/ptlrpc/service.c @@ -2046,7 +2046,7 @@ static int ptlrpc_main(void *arg) goto out; } - env = kzalloc(sizeof(*env), GFP_NOFS); + env = kzalloc(sizeof(*env), GFP_KERNEL); if (!env) { rc = -ENOMEM; goto out_srv_fini; @@ -2072,7 +2072,7 @@ static int ptlrpc_main(void *arg) } /* Alloc reply state structure for this one */ - rs = kvzalloc(svc->srv_max_reply_size, GFP_NOFS); + rs = kvzalloc(svc->srv_max_reply_size, GFP_KERNEL); if (!rs) { rc = -ENOMEM; goto out_srv_fini; -- 2.7.4