LU-12616 obclass: fix MDS start/stop race

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

diff --git a/lustre/mdd/mdd_permission.c b/lustre/mdd/mdd_permission.c
index 4b4f9b9..5d00907 100644 (file)
--- a/lustre/mdd/mdd_permission.c
+++ b/lustre/mdd/mdd_permission.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) 2012, 2016, Intel Corporation.
+ * Copyright (c) 2012, 2017, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -40,7 +40,6 @@
 #define DEBUG_SUBSYSTEM S_MDS
 
 #include <obd_class.h>
-#include <lustre_ver.h>
 #include <lprocfs_status.h>
 #include <lustre_mds.h>
 #include <lustre_idmap.h>
@@ -63,8 +62,15 @@ int mdd_acl_chmod(const struct lu_env *env, struct mdd_object *o, __u32 mode,
        ENTRY;
 
        lu_buf_check_and_alloc(&mdd_env_info(env)->mti_xattr_buf,
-                       mdd_obj2mdd_dev(o)->mdd_dt_conf.ddp_max_ea_size);
+                       MIN(mdd_obj2mdd_dev(o)->mdd_dt_conf.ddp_max_ea_size,
+                           XATTR_SIZE_MAX));
        buf = mdd_env_info(env)->mti_xattr_buf;
+       if (buf.lb_buf == NULL)
+               RETURN(-ENOMEM);
+
+       if (buf.lb_len > XATTR_SIZE_MAX)
+               buf.lb_len  = XATTR_SIZE_MAX;
+
        rc = mdo_xattr_get(env, o, &buf, XATTR_NAME_ACL_ACCESS);
        if ((rc == -EOPNOTSUPP) || (rc == -ENODATA))
                RETURN(0);
@@ -141,7 +147,7 @@ int mdd_acl_set(const struct lu_env *env, struct mdd_object *obj,
        if (rc)
                GOTO(stop, rc);
 
-       mdd_write_lock(env, obj, MOR_TGT_CHILD);
+       mdd_write_lock(env, obj, DT_TGT_CHILD);
        /* whether ACL can be represented by i_mode only */
        if (not_equiv)
                rc = mdo_xattr_set(env, obj, buf, XATTR_NAME_ACL_ACCESS, fl,
@@ -211,8 +217,15 @@ static int mdd_check_acl(const struct lu_env *env, struct mdd_object *obj,
        ENTRY;
 
        lu_buf_check_and_alloc(&mdd_env_info(env)->mti_xattr_buf,
-                       mdd_obj2mdd_dev(obj)->mdd_dt_conf.ddp_max_ea_size);
+                       MIN(mdd_obj2mdd_dev(obj)->mdd_dt_conf.ddp_max_ea_size,
+                           XATTR_SIZE_MAX));
        buf = mdd_env_info(env)->mti_xattr_buf;
+       if (buf.lb_buf == NULL)
+               RETURN(-ENOMEM);
+
+       if (buf.lb_len > XATTR_SIZE_MAX)
+               buf.lb_len  = XATTR_SIZE_MAX;
+
        rc = mdo_xattr_get(env, obj, &buf, XATTR_NAME_ACL_ACCESS);
        if (rc <= 0)
                RETURN(rc ? : -EACCES);
@@ -302,9 +315,8 @@ check_capabilities:
        RETURN(-EACCES);
 }
 
-int mdd_permission(const struct lu_env *env,
-                   struct md_object *pobj, struct md_object *cobj,
-                   struct md_attr *ma, int mask)
+int mdd_permission(const struct lu_env *env, struct md_object *pobj,
+                  struct md_object *cobj, struct md_attr *ma, int mask)
 {
        struct mdd_object *mdd_pobj = NULL;
        struct mdd_object *mdd_cobj;
@@ -328,15 +340,9 @@ int mdd_permission(const struct lu_env *env,
        if (rc)
                RETURN(rc);
 
-       /* For cross_open case, the "mask" is open flags,
-        * so convert it to permission mask first.
-        * XXX: MDS_OPEN_CROSS must be NOT equal to permission mask MAY_*. */
-       if (unlikely(mask & MDS_OPEN_CROSS))
-               mask = accmode(env, cattr, mask & ~MDS_OPEN_CROSS);
-
        rc = mdd_permission_internal_locked(env, mdd_cobj, cattr,
                                            mask & ~MAY_RGETFACL,
-                                           MOR_TGT_CHILD);
+                                           DT_TGT_CHILD);
 
        if (unlikely(rc == 0 && (mask & MAY_RGETFACL))) {
                if (likely(!uc))