LU-11017 quota: ignore quota for CAP_SYS_RESOURCE properly

[fs/lustre-release.git] / lustre / mdd / mdd_trans.c

diff --git a/lustre/mdd/mdd_trans.c b/lustre/mdd/mdd_trans.c
index 0342ed2..2004bfc 100644 (file)
--- a/lustre/mdd/mdd_trans.c
+++ b/lustre/mdd/mdd_trans.c
@@ -23,7 +23,7 @@
  * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2011, 2014, Intel Corporation.
+ * Copyright (c) 2011, 2017, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -41,13 +41,28 @@
 #include <obd_class.h>
 #include <lprocfs_status.h>
 #include <lustre_mds.h>
+#include <lustre_barrier.h>
 
 #include "mdd_internal.h"
 
 struct thandle *mdd_trans_create(const struct lu_env *env,
                                  struct mdd_device *mdd)
 {
-        return mdd_child_ops(mdd)->dt_trans_create(env, mdd->mdd_child);
+       struct thandle *th;
+       struct lu_ucred *uc = lu_ucred_check(env);
+
+       /* If blocked by the write barrier, then return "-EINPROGRESS"
+        * to the caller. Usually, such error will be forwarded to the
+        * client, and the expected behaviour is to re-try such modify
+        * RPC some time later until the barrier is thawed or expired. */
+       if (unlikely(!barrier_entry(mdd->mdd_bottom)))
+               return ERR_PTR(-EINPROGRESS);
+
+       th = mdd_child_ops(mdd)->dt_trans_create(env, mdd->mdd_child);
+       if (!IS_ERR(th) && uc)
+               th->th_ignore_quota = !!md_capable(uc, CFS_CAP_SYS_RESOURCE);
+
+       return th;
 }
 
 int mdd_trans_start(const struct lu_env *env, struct mdd_device *mdd,
@@ -63,6 +78,7 @@ int mdd_trans_stop(const struct lu_env *env, struct mdd_device *mdd,
 
        handle->th_result = result;
        rc = mdd_child_ops(mdd)->dt_trans_stop(env, mdd->mdd_child, handle);
+       barrier_exit(mdd->mdd_bottom);
 
        /* if operation failed, return \a result, otherwise return status of
         * dt_trans_stop */