LU-1346 libcfs: replace CFS_CAP_XXX with kernel definition

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

diff --git a/lustre/mdd/mdd_object.c b/lustre/mdd/mdd_object.c
index 2ed976d..7b8663c 100644 (file)
--- a/lustre/mdd/mdd_object.c
+++ b/lustre/mdd/mdd_object.c
@@ -503,7 +503,7 @@ static int mdd_fix_attr(const struct lu_env *env, struct mdd_object *obj,
                                 (LUSTRE_IMMUTABLE_FL | LUSTRE_APPEND_FL);
 
                if ((uc->uc_fsuid != tmp_la->la_uid) &&
-                   !md_capable(uc, CFS_CAP_FOWNER))
+                   !md_capable(uc, CAP_FOWNER))
                        RETURN(-EPERM);
 
                /* XXX: the IMMUTABLE and APPEND_ONLY flags can
@@ -513,7 +513,7 @@ static int mdd_fix_attr(const struct lu_env *env, struct mdd_object *obj,
                if (mdd_is_append(obj))
                        oldflags |= LUSTRE_APPEND_FL;
                if ((oldflags ^ newflags) &&
-                   !md_capable(uc, CFS_CAP_LINUX_IMMUTABLE))
+                   !md_capable(uc, CAP_LINUX_IMMUTABLE))
                        RETURN(-EPERM);
 
                 if (!S_ISDIR(tmp_la->la_mode))
@@ -529,7 +529,7 @@ static int mdd_fix_attr(const struct lu_env *env, struct mdd_object *obj,
        if ((la->la_valid & (LA_MTIME | LA_ATIME | LA_CTIME)) &&
            !(la->la_valid & ~(LA_MTIME | LA_ATIME | LA_CTIME))) {
                if ((uc->uc_fsuid != tmp_la->la_uid) &&
-                   !md_capable(uc, CFS_CAP_FOWNER)) {
+                   !md_capable(uc, CAP_FOWNER)) {
                        rc = mdd_permission_internal(env, obj, tmp_la,
                                                     MAY_WRITE);
                        if (rc)
@@ -562,7 +562,7 @@ static int mdd_fix_attr(const struct lu_env *env, struct mdd_object *obj,
         if (la->la_valid & LA_MODE) {
                if (!(flags & MDS_PERM_BYPASS) &&
                    (uc->uc_fsuid != tmp_la->la_uid) &&
-                   !md_capable(uc, CFS_CAP_FOWNER))
+                   !md_capable(uc, CAP_FOWNER))
                        RETURN(-EPERM);
 
                if (la->la_mode == (umode_t) -1)
@@ -574,7 +574,7 @@ static int mdd_fix_attr(const struct lu_env *env, struct mdd_object *obj,
                /* Also check the setgid bit! */
                if (!lustre_in_group_p(uc, (la->la_valid & LA_GID) ?
                                       la->la_gid : tmp_la->la_gid) &&
-                   !md_capable(uc, CFS_CAP_FSETID))
+                   !md_capable(uc, CAP_FSETID))
                        la->la_mode &= ~S_ISGID;
        } else {
               la->la_mode = tmp_la->la_mode;
@@ -586,7 +586,7 @@ static int mdd_fix_attr(const struct lu_env *env, struct mdd_object *obj,
                         la->la_uid = tmp_la->la_uid;
                if (((uc->uc_fsuid != tmp_la->la_uid) ||
                     (la->la_uid != tmp_la->la_uid)) &&
-                   !md_capable(uc, CFS_CAP_CHOWN))
+                   !md_capable(uc, CAP_CHOWN))
                        RETURN(-EPERM);
 
                 /* If the user or group of a non-directory has been
@@ -612,7 +612,7 @@ static int mdd_fix_attr(const struct lu_env *env, struct mdd_object *obj,
                if (((uc->uc_fsuid != tmp_la->la_uid) ||
                     ((la->la_gid != tmp_la->la_gid) &&
                      !lustre_in_group_p(uc, la->la_gid))) &&
-                   !md_capable(uc, CFS_CAP_CHOWN))
+                   !md_capable(uc, CAP_CHOWN))
                        RETURN(-EPERM);
 
                 /* Likewise, if the user or group of a non-directory
@@ -943,7 +943,7 @@ static int mdd_xattr_sanity_check(const struct lu_env *env,
                RETURN(rc);
 
        if ((uc->uc_fsuid != tmp_la->la_uid) &&
-           !md_capable(uc, CFS_CAP_FOWNER))
+           !md_capable(uc, CAP_FOWNER))
                RETURN(-EPERM);
 
        RETURN(rc);
@@ -1651,7 +1651,7 @@ static int mdd_open_sanity_check(const struct lu_env *env,
                if (uc && ((uc->uc_valid == UCRED_OLD) ||
                           (uc->uc_valid == UCRED_NEW)) &&
                    (uc->uc_fsuid != tmp_la->la_uid) &&
-                   !md_capable(uc, CFS_CAP_FOWNER))
+                   !md_capable(uc, CAP_FOWNER))
                        RETURN(-EPERM);
         }
 #endif