LU-1581 build: remove false ldiskfs dependencies

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

diff --git a/lustre/mdd/mdd_permission.c b/lustre/mdd/mdd_permission.c
index d997344..21e1659 100644 (file)
--- a/lustre/mdd/mdd_permission.c
+++ b/lustre/mdd/mdd_permission.c
@@ -1,6 +1,4 @@
-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
- *
+/*
  * GPL HEADER START
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -26,7 +24,7 @@
  * GPL HEADER END
  */
 /*
- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  */
 /*
@@ -40,22 +38,13 @@
  * Author: fangyong@clusterfs.com
  * Author: lsy@clusterfs.com
  */
-#ifndef EXPORT_SYMTAB
-# define EXPORT_SYMTAB
-#endif
+
 #define DEBUG_SUBSYSTEM S_MDS
 
-#include <linux/module.h>
-#include <linux/jbd.h>
-#include <obd.h>
 #include <obd_class.h>
 #include <lustre_ver.h>
-#include <obd_support.h>
 #include <lprocfs_status.h>
-
-#include <linux/ldiskfs_fs.h>
 #include <lustre_mds.h>
-#include <lustre/lustre_idl.h>
 
 #include "mdd_internal.h"
 
@@ -65,7 +54,7 @@
  * Get default acl EA only.
  * Hold read_lock for mdd_obj.
  */
-int mdd_acl_def_get(const struct lu_env *env, struct mdd_object *mdd_obj, 
+int mdd_def_acl_get(const struct lu_env *env, struct mdd_object *mdd_obj,
                     struct md_attr *ma)
 {
         struct lu_buf *buf;
@@ -74,7 +63,7 @@ int mdd_acl_def_get(const struct lu_env *env, struct mdd_object *mdd_obj,
 
         if (ma->ma_valid & MA_ACL_DEF)
                 RETURN(0);
-        
+
         buf = mdd_buf_get(env, ma->ma_acl, ma->ma_acl_size);
         rc = mdo_xattr_get(env, mdd_obj, buf, XATTR_NAME_ACL_DEFAULT,
                            BYPASS_CAPA);
@@ -91,7 +80,7 @@ int mdd_acl_def_get(const struct lu_env *env, struct mdd_object *mdd_obj,
 /*
  * Hold write_lock for o.
  */
-int mdd_acl_chmod(const struct lu_env *env, struct mdd_object *o, __u32 mode, 
+int mdd_acl_chmod(const struct lu_env *env, struct mdd_object *o, __u32 mode,
                   struct thandle *handle)
 {
         struct lu_buf           *buf;
@@ -102,9 +91,9 @@ int mdd_acl_chmod(const struct lu_env *env, struct mdd_object *o, __u32 mode,
 
         ENTRY;
 
-        buf = mdd_buf_get(env, mdd_env_info(env)->mti_xattr_buf, 
+        buf = mdd_buf_get(env, mdd_env_info(env)->mti_xattr_buf,
                           sizeof(mdd_env_info(env)->mti_xattr_buf));
-        
+
         rc = mdo_xattr_get(env, o, buf, XATTR_NAME_ACL_ACCESS, BYPASS_CAPA);
         if ((rc == -EOPNOTSUPP) || (rc == -ENODATA))
                 RETURN(0);
@@ -118,7 +107,7 @@ int mdd_acl_chmod(const struct lu_env *env, struct mdd_object *o, __u32 mode,
                       sizeof(posix_acl_xattr_entry);
         if (entry_count <= 0)
                 RETURN(0);
-       
+
         rc = lustre_posix_acl_chmod_masq(entry, mode, entry_count);
         if (rc)
                 RETURN(rc);
@@ -147,13 +136,13 @@ int __mdd_acl_init(const struct lu_env *env, struct mdd_object *obj,
                       sizeof(posix_acl_xattr_entry);
         if (entry_count <= 0)
                 RETURN(0);
-       
-       if (S_ISDIR(*mode)) {
-                rc = mdo_xattr_set(env, obj, buf, XATTR_NAME_ACL_DEFAULT, 0, 
+
+        if (S_ISDIR(*mode)) {
+                rc = mdo_xattr_set(env, obj, buf, XATTR_NAME_ACL_DEFAULT, 0,
                                    handle, BYPASS_CAPA);
                 if (rc)
                         RETURN(rc);
-       }
+        }
 
         rc = lustre_posix_acl_create_masq(entry, mode, entry_count);
         if (rc <= 0)
@@ -163,33 +152,6 @@ int __mdd_acl_init(const struct lu_env *env, struct mdd_object *obj,
                            BYPASS_CAPA);
         RETURN(rc);
 }
-
-/*
- * Hold read_lock for pobj.
- * Hold write_lock for cobj.
- */
-int mdd_acl_init(const struct lu_env *env, struct mdd_object *pobj,
-                 struct mdd_object *cobj, __u32 *mode, struct thandle *handle)
-{
-        struct lu_buf   *buf;
-        int             rc;
-        ENTRY;
-
-       if (S_ISLNK(*mode))
-                RETURN(0);
-
-        buf = mdd_buf_get(env, mdd_env_info(env)->mti_xattr_buf, 
-                          sizeof(mdd_env_info(env)->mti_xattr_buf));
-        rc = mdo_xattr_get(env, pobj, buf, XATTR_NAME_ACL_DEFAULT, BYPASS_CAPA);
-        if ((rc == -EOPNOTSUPP) || (rc == -ENODATA))
-                RETURN(0);
-        else if (rc <= 0)
-                RETURN(rc);
-
-        buf->lb_len = rc;
-        rc = __mdd_acl_init(env, cobj, buf, mode, handle);
-        RETURN(rc);
-}
 #endif
 
 /*
@@ -207,7 +169,7 @@ static int mdd_check_acl(const struct lu_env *env, struct mdd_object *obj,
         int rc;
         ENTRY;
 
-        buf = mdd_buf_get(env, mdd_env_info(env)->mti_xattr_buf, 
+        buf = mdd_buf_get(env, mdd_env_info(env)->mti_xattr_buf,
                           sizeof(mdd_env_info(env)->mti_xattr_buf));
         rc = mdo_xattr_get(env, obj, buf, XATTR_NAME_ACL_ACCESS,
                            mdd_object_capa(env, obj));
@@ -229,7 +191,7 @@ static int mdd_check_acl(const struct lu_env *env, struct mdd_object *obj,
 }
 
 int __mdd_permission_internal(const struct lu_env *env, struct mdd_object *obj,
-                              struct lu_attr *la, int mask, int needlock)
+                              struct lu_attr *la, int mask, int role)
 {
         struct md_ucred *uc = md_ucred(env);
         __u32 mode;
@@ -265,10 +227,10 @@ int __mdd_permission_internal(const struct lu_env *env, struct mdd_object *obj,
                 mode >>= 6;
         } else {
                 if (mode & S_IRWXG) {
-                        if (needlock)
-                                mdd_read_lock(env, obj);
+                        if (role != -1)
+                                mdd_read_lock(env, obj, role);
                         rc = mdd_check_acl(env, obj, la, mask);
-                        if (needlock)
+                        if (role != -1)
                                 mdd_read_unlock(env, obj);
                         if (rc == -EACCES)
                                 goto check_capabilities;
@@ -286,18 +248,18 @@ int __mdd_permission_internal(const struct lu_env *env, struct mdd_object *obj,
 check_capabilities:
         if (!(mask & MAY_EXEC) ||
             (la->la_mode & S_IXUGO) || S_ISDIR(la->la_mode))
-                if (mdd_capable(uc, CAP_DAC_OVERRIDE))
+                if (mdd_capable(uc, CFS_CAP_DAC_OVERRIDE))
                         RETURN(0);
 
         if ((mask == MAY_READ) ||
             (S_ISDIR(la->la_mode) && !(mask & MAY_WRITE)))
-                if (mdd_capable(uc, CAP_DAC_READ_SEARCH))
+                if (mdd_capable(uc, CFS_CAP_DAC_READ_SEARCH))
                         RETURN(0);
 
         RETURN(-EACCES);
 }
 
-int mdd_permission(const struct lu_env *env, 
+int mdd_permission(const struct lu_env *env,
                    struct md_object *pobj, struct md_object *cobj,
                    struct md_attr *ma, int mask)
 {
@@ -342,7 +304,8 @@ int mdd_permission(const struct lu_env *env,
                 MAY_VTX_PART | MAY_VTX_FULL |
                 MAY_RGETFACL);
 
-        rc = mdd_permission_internal_locked(env, mdd_cobj, NULL, mask);
+        rc = mdd_permission_internal_locked(env, mdd_cobj, NULL, mask,
+                                            MOR_TGT_CHILD);
 
         if (!rc && (check_create || check_link))
                 rc = mdd_may_create(env, mdd_cobj, NULL, 1, check_link);
@@ -392,7 +355,8 @@ int mdd_permission(const struct lu_env *env,
                                 RETURN(rc);
                 }
 
-                if (la->la_uid != uc->mu_fsuid && !mdd_capable(uc, CAP_FOWNER))
+                if (la->la_uid != uc->mu_fsuid &&
+                    !mdd_capable(uc, CFS_CAP_FOWNER))
                         rc = -EPERM;
         }
 
@@ -411,7 +375,7 @@ int mdd_capa_get(const struct lu_env *env, struct md_object *obj,
                           capa->lc_opc);
         if (IS_ERR(oc)) {
                 rc = PTR_ERR(oc);
-        } else {
+        } else if (likely(oc != NULL)) {
                 capa_cpy(capa, oc);
                 capa_put(oc);
         }