LU-1346 libcfs: replace libcfs wrappers with kernel API

[fs/lustre-release.git] / lustre / osd-zfs / osd_xattr.c

diff --git a/lustre/osd-zfs/osd_xattr.c b/lustre/osd-zfs/osd_xattr.c
index 94372f2..10033c0 100644 (file)
--- a/lustre/osd-zfs/osd_xattr.c
+++ b/lustre/osd-zfs/osd_xattr.c
@@ -234,9 +234,9 @@ int osd_xattr_get(const struct lu_env *env, struct dt_object *dt,
        LASSERT(osd_invariant(obj));
        LASSERT(dt_object_exists(dt));
 
-       cfs_down(&obj->oo_guard);
+       down(&obj->oo_guard);
        rc = __osd_xattr_get(env, obj, buf, name, &size);
-       cfs_up(&obj->oo_guard);
+       up(&obj->oo_guard);
 
        if (rc == -ENOENT)
                rc = -ENODATA;
@@ -321,9 +321,9 @@ int osd_declare_xattr_set(const struct lu_env *env, struct dt_object *dt,
        LASSERT(handle != NULL);
        oh = container_of0(handle, struct osd_thandle, ot_super);
 
-       cfs_down(&obj->oo_guard);
+       down(&obj->oo_guard);
        __osd_xattr_declare_set(env, obj, buf->lb_len, name, oh);
-       cfs_up(&obj->oo_guard);
+       up(&obj->oo_guard);
 
        RETURN(0);
 }
@@ -564,11 +564,11 @@ int osd_xattr_set(const struct lu_env *env, struct dt_object *dt,
 
        oh = container_of0(handle, struct osd_thandle, ot_super);
 
-       cfs_down(&obj->oo_guard);
+       down(&obj->oo_guard);
        CDEBUG(D_INODE, "Setting xattr %s with size %d\n",
                name, (int)buf->lb_len);
        rc = osd_xattr_set_internal(env, obj, buf, name, fl, oh, capa);
-       cfs_up(&obj->oo_guard);
+       up(&obj->oo_guard);
 
        RETURN(rc);
 }
@@ -625,9 +625,9 @@ int osd_declare_xattr_del(const struct lu_env *env, struct dt_object *dt,
        LASSERT(oh->ot_tx != NULL);
        LASSERT(obj->oo_db != NULL);
 
-       cfs_down(&obj->oo_guard);
+       down(&obj->oo_guard);
        __osd_xattr_declare_del(env, obj, name, oh);
-       cfs_up(&obj->oo_guard);
+       up(&obj->oo_guard);
 
        RETURN(0);
 }
@@ -700,9 +700,9 @@ int osd_xattr_del(const struct lu_env *env, struct dt_object *dt,
        oh = container_of0(handle, struct osd_thandle, ot_super);
        LASSERT(oh->ot_tx != NULL);
 
-       cfs_down(&obj->oo_guard);
+       down(&obj->oo_guard);
        rc = __osd_xattr_del(env, obj, name, oh);
-       cfs_up(&obj->oo_guard);
+       up(&obj->oo_guard);
 
        RETURN(rc);
 }
@@ -755,7 +755,7 @@ int osd_xattr_list(const struct lu_env *env, struct dt_object *dt,
        LASSERT(osd_invariant(obj));
        LASSERT(dt_object_exists(dt));
 
-       cfs_down(&obj->oo_guard);
+       down(&obj->oo_guard);
 
        rc = osd_sa_xattr_list(env, obj, lb);
        if (rc < 0)
@@ -795,7 +795,7 @@ int osd_xattr_list(const struct lu_env *env, struct dt_object *dt,
 out_fini:
        udmu_zap_cursor_fini(zc);
 out:
-       cfs_up(&obj->oo_guard);
+       up(&obj->oo_guard);
        RETURN(rc);
 
 }