LU-4357 libcfs: restore __GFP_WAIT flag to memalloc calls

[fs/lustre-release.git] / lustre / osd-ldiskfs / osd_handler.c

diff --git a/lustre/osd-ldiskfs/osd_handler.c b/lustre/osd-ldiskfs/osd_handler.c
index 3ffec10..a8022f0 100644 (file)
--- a/lustre/osd-ldiskfs/osd_handler.c
+++ b/lustre/osd-ldiskfs/osd_handler.c
@@ -946,21 +946,21 @@ static struct thandle *osd_trans_create(const struct lu_env *env,
        /* on pending IO in this thread should left from prev. request */
        LASSERT(atomic_read(&iobuf->dr_numreqs) == 0);
 
-        th = ERR_PTR(-ENOMEM);
-       OBD_ALLOC_GFP(oh, sizeof *oh, __GFP_IO);
-        if (oh != NULL) {
+       th = ERR_PTR(-ENOMEM);
+       OBD_ALLOC_GFP(oh, sizeof *oh, GFP_NOFS);
+       if (oh != NULL) {
                oh->ot_quota_trans = &oti->oti_quota_trans;
                memset(oh->ot_quota_trans, 0, sizeof(*oh->ot_quota_trans));
-                th = &oh->ot_super;
-                th->th_dev = d;
-                th->th_result = 0;
-                th->th_tags = LCT_TX_HANDLE;
-                oh->ot_credits = 0;
+               th = &oh->ot_super;
+               th->th_dev = d;
+               th->th_result = 0;
+               th->th_tags = LCT_TX_HANDLE;
+               oh->ot_credits = 0;
                atomic_set(&th->th_refc, 1);
                th->th_alloc_size = sizeof(*oh);
                oti->oti_dev = osd_dt_dev(d);
-                CFS_INIT_LIST_HEAD(&oh->ot_dcb_list);
-                osd_th_alloced(oh);
+               CFS_INIT_LIST_HEAD(&oh->ot_dcb_list);
+               osd_th_alloced(oh);
 
                memset(oti->oti_declare_ops, 0,
                                        sizeof(oti->oti_declare_ops));
@@ -969,8 +969,8 @@ static struct thandle *osd_trans_create(const struct lu_env *env,
                memset(oti->oti_declare_ops_cred, 0,
                                        sizeof(oti->oti_declare_ops_cred));
                oti->oti_rollback = false;
-        }
-        RETURN(th);
+       }
+       RETURN(th);
 }
 
 /*