add lu_object_exists() and use it

diff --git a/lustre/cmm/cmm_object.c b/lustre/cmm/cmm_object.c
index 0889953..573b418 100644 (file)
--- a/lustre/cmm/cmm_object.c
+++ b/lustre/cmm/cmm_object.c
@@ -55,7 +55,7 @@ static struct lu_device *cmm_get_child(struct cmm_device *d, __u32 num)
         } else {
                 struct mdc_device *mdc;
                 list_for_each_entry(mdc, &d->cmm_targets, mc_linkage) {
-                        if (mdc->mc_num == num) { 
+                        if (mdc->mc_num == num) {
                                 next = mdc2lu_dev(mdc);
                                 break;
                         }
@@ -96,7 +96,7 @@ int cmm_object_init(struct lu_context *ctxt, struct lu_object *o)
         /* under device can be MDD or MDC */
         mdsnum = cmm_fld_lookup(fid);
         under = cmm_get_child(d, mdsnum);
-        if (under == NULL) 
+        if (under == NULL)
                 RETURN(-ENOENT);
 
         below = under->ld_ops->ldo_object_alloc(ctxt, under);
@@ -124,9 +124,7 @@ void cmm_object_release(struct lu_context *ctxt, struct lu_object *o)
 
 static int cmm_object_exists(struct lu_context *ctx, struct lu_object *o)
 {
-        struct lu_object *next = lu_object_next(o);
-
-        return next->lo_ops->loo_object_exists(ctx, next);
+        return lu_object_exists(ctx, lu_object_next(o));
 }
 
 static int cmm_object_print(struct lu_context *ctx,

diff --git a/lustre/include/linux/dt_object.h b/lustre/include/linux/dt_object.h
index bcd6f87..5369592 100644 (file)
--- a/lustre/include/linux/dt_object.h
+++ b/lustre/include/linux/dt_object.h
@@ -96,16 +96,14 @@ struct dt_device_operations {
         /*
          * Create new object on this device.
          *
-         * postcondition: ergo(result == 0,
-         *                     dt->do_lu.lo_ops->loo_object_exists(ctxt,
-         *                                                         &dt->do_lu));
+         * postcondition: ergo(result == 0, lu_object_exists(ctxt, &dt->do_lu));
          */
         int   (*dt_object_create)(struct lu_context *ctxt, struct dt_object *dt,
                                   struct thandle *th);
         /*
          * Destroy existing object.
          *
-         * precondition: dt->do_lu.lo_ops->loo_object_exists(ctxt, &dt->do_lu);
+         * precondition: lu_object_exists(ctxt, &dt->do_lu);
          */
         int   (*dt_object_destroy)(struct lu_context *ctxt,
                                    struct dt_object *dt, struct thandle *th);
@@ -132,28 +130,28 @@ struct dt_object_operations {
         /*
          * Return standard attributes.
          *
-         * precondition: dt->do_lu.lo_ops->loo_object_exists(ctxt, &dt->do_lu);
+         * precondition: lu_object_exists(ctxt, &dt->do_lu);
          */
         int   (*do_attr_get)(struct lu_context *ctxt, struct dt_object *dt,
                              struct lu_attr *attr);
         /*
          * Set standard attributes.
          *
-         * precondition: dt->do_lu.lo_ops->loo_object_exists(ctxt, &dt->do_lu);
+         * precondition: lu_object_exists(ctxt, &dt->do_lu);
          */
         int   (*do_attr_set)(struct lu_context *ctxt, struct dt_object *dt,
                              struct lu_attr *attr, struct thandle *handle);
         /*
          * Return a value of an extended attribute.
          *
-         * precondition: dt->do_lu.lo_ops->loo_object_exists(ctxt, &dt->do_lu);
+         * precondition: lu_object_exists(ctxt, &dt->do_lu);
          */
         int   (*do_xattr_get)(struct lu_context *ctxt, struct dt_object *dt,
                               void *buf, int buf_len, const char *name);
         /*
          * Set value of an extended attribute.
          *
-         * precondition: dt->do_lu.lo_ops->loo_object_exists(ctxt, &dt->do_lu);
+         * precondition: lu_object_exists(ctxt, &dt->do_lu);
          */
         int   (*do_xattr_set)(struct lu_context *ctxt, struct dt_object *dt,
                               void *buf, int buf_len, const char *name,
@@ -165,15 +163,15 @@ struct dt_object_operations {
  */
 struct dt_body_operations {
         /*
-         * precondition: dt->do_lu.lo_ops->loo_object_exists(ctxt, &dt->do_lu);
+         * precondition: lu_object_exists(ctxt, &dt->do_lu);
          */
         int (*dbo_read)(struct lu_context *ctxt, struct dt_object *dt, ...);
         /*
-         * precondition: dt->do_lu.lo_ops->loo_object_exists(ctxt, &dt->do_lu);
+         * precondition: lu_object_exists(ctxt, &dt->do_lu);
          */
         int (*dbo_write)(struct lu_context *ctxt, struct dt_object *dt, ...);
         /*
-         * precondition: dt->do_lu.lo_ops->loo_object_exists(ctxt, &dt->do_lu);
+         * precondition: lu_object_exists(ctxt, &dt->do_lu);
          */
         int (*dbo_truncate)(struct lu_context *ctxt, struct dt_object *dt, ...);
 };
@@ -183,14 +181,14 @@ struct dt_body_operations {
  */
 struct dt_index_operations {
         /*
-         * precondition: dt->do_lu.lo_ops->loo_object_exists(ctxt, &dt->do_lu);
+         * precondition: lu_object_exists(ctxt, &dt->do_lu);
          */
         int   (*dio_index_insert)(struct lu_context *ctxt,
                                   struct dt_object *dt,
                                   struct lu_fid *fid, const char *name,
                                   struct thandle *handle);
         /*
-         * precondition: dt->do_lu.lo_ops->loo_object_exists(ctxt, &dt->do_lu);
+         * precondition: lu_object_exists(ctxt, &dt->do_lu);
          */
         int   (*dio_index_delete)(struct lu_context *ctxt,
                                   struct dt_object *dt,

diff --git a/lustre/mdd/mdd_handler.c b/lustre/mdd/mdd_handler.c
index 339a2a1..63eabef 100644 (file)
--- a/lustre/mdd/mdd_handler.c
+++ b/lustre/mdd/mdd_handler.c
@@ -259,9 +259,7 @@ static void mdd_object_release(struct lu_context *ctxt, struct lu_object *o)
 
 static int mdd_object_exists(struct lu_context *ctx, struct lu_object *o)
 {
-        struct lu_object *next = lu_object_next(o);
-
-        return next->lo_ops->loo_object_exists(ctx, next);
+        return lu_object_exists(ctx, lu_object_next(o));
 }
 
 static int mdd_object_print(struct lu_context *ctxt,
@@ -400,7 +398,7 @@ __mdd_object_create(struct lu_context *ctxt, struct mdd_object *obj,
 
 static int mdd_object_create(struct lu_context *ctxt, struct md_object *obj)
 {
-        
+
         struct mdd_device *mdd = mdo2mdd(obj);
         struct thandle *handle;
         int rc;
@@ -707,7 +705,7 @@ static int mdd_mkname(struct lu_context *ctxt, struct md_object *pobj,
 #if 0
         rc = __mdd_index_insert(ctxt, mdd, mdo2mddo(pobj), mdo2mddo(child),
                                 name, handle);
-#endif 
+#endif
         rc = -EOPNOTSUPP;
 
         mdd_unlock(ctxt, mdo2mddo(pobj), DT_WRITE_LOCK);

diff --git a/lustre/osd/osd_handler.c b/lustre/osd/osd_handler.c
index 7bf9be2..815a709 100644 (file)
--- a/lustre/osd/osd_handler.c
+++ b/lustre/osd/osd_handler.c
@@ -228,7 +228,7 @@ static int osd_statfs(struct lu_context *ctx,
 static int osd_attr_get(struct lu_context *ctxt, struct dt_object *dt,
                         struct lu_attr *attr)
 {
-        LASSERT(dt->do_lu.lo_ops->loo_object_exists(ctxt, &dt->do_lu));
+        LASSERT(lu_object_exists(ctxt, &dt->do_lu));
         return osd_inode_getattr(ctxt, dt2osd_obj(dt)->oo_inode, attr);
 }