LU-11010 tests: remove calls to return after skip()

[fs/lustre-release.git] / lustre / lod / lod_sub_object.c

diff --git a/lustre/lod/lod_sub_object.c b/lustre/lod/lod_sub_object.c
index 2b0d71e..ba97709 100644 (file)
--- a/lustre/lod/lod_sub_object.c
+++ b/lustre/lod/lod_sub_object.c
@@ -20,7 +20,7 @@
  * GPL HEADER END
  */
 /*
- * Copyright (c) 2015, Intel Corporation.
+ * Copyright (c) 2015, 2017, Intel Corporation.
  */
 /*
  * lustre/lod/lod_sub_object.c
@@ -42,12 +42,12 @@
 
 #include <obd.h>
 #include <obd_class.h>
-#include <lustre_ver.h>
+#include <uapi/linux/lustre/lustre_ver.h>
 #include <obd_support.h>
 #include <lprocfs_status.h>
 
 #include <lustre_fid.h>
-#include <lustre_param.h>
+#include <uapi/linux/lustre/lustre_param.h>
 #include <md_object.h>
 #include <lustre_linkea.h>
 #include <lustre_log.h>
@@ -74,6 +74,7 @@ struct thandle *lod_sub_get_thandle(const struct lu_env *env,
                RETURN(th);
 
        tth = container_of(th, struct top_thandle, tt_super);
+       tth->tt_master_sub_thandle->th_ignore_quota = th->th_ignore_quota;
 
        /* local object must be mdt object, Note: during ost object
         * creation, FID is not assigned until osp_create(),
@@ -103,6 +104,7 @@ struct thandle *lod_sub_get_thandle(const struct lu_env *env,
        sub_th = thandle_get_sub(env, th, sub_obj);
        if (IS_ERR(sub_th))
                RETURN(sub_th);
+       sub_th->th_ignore_quota = th->th_ignore_quota;
 
        if (tth->tt_multiple_thandle != NULL && record_update != NULL &&
            th->th_result == 0)