LU-3239 ofd: refill env in ofd_get_info

[fs/lustre-release.git] / lustre / ofd / ofd_objects.c

diff --git a/lustre/ofd/ofd_objects.c b/lustre/ofd/ofd_objects.c
index 1dd1abb..00226cb 100644 (file)
--- a/lustre/ofd/ofd_objects.c
+++ b/lustre/ofd/ofd_objects.c
@@ -27,7 +27,7 @@
  * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2012, Intel Corporation.
+ * Copyright (c) 2012, 2013, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -42,6 +42,7 @@
 #define DEBUG_SUBSYSTEM S_FILTER
 
 #include <dt_object.h>
+#include <lustre/lustre_idl.h>
 
 #include "ofd_internal.h"
 
@@ -111,8 +112,7 @@ struct ofd_object *ofd_object_find_or_create(const struct lu_env *env,
 
 int ofd_object_ff_check(const struct lu_env *env, struct ofd_object *fo)
 {
-       struct ofd_thread_info  *info = ofd_info(env);
-       int                      rc = 0;
+       int rc = 0;
 
        ENTRY;
 
@@ -121,9 +121,7 @@ int ofd_object_ff_check(const struct lu_env *env, struct ofd_object *fo)
                 * This actually means that we don't know whether the object
                 * has the "fid" EA or not.
                 */
-               info->fti_buf.lb_buf = &info->fti_mds_fid2;
-               info->fti_buf.lb_len = sizeof(info->fti_mds_fid2);
-               rc = dt_xattr_get(env, ofd_object_child(fo), &info->fti_buf,
+               rc = dt_xattr_get(env, ofd_object_child(fo), &LU_BUF_NULL,
                                  XATTR_NAME_FID, BYPASS_CAPA);
                if (rc >= 0 || rc == -ENODATA) {
                        /*
@@ -146,7 +144,7 @@ void ofd_object_put(const struct lu_env *env, struct ofd_object *fo)
 }
 
 int ofd_precreate_objects(const struct lu_env *env, struct ofd_device *ofd,
-                         obd_id id, struct ofd_seq *oseq, int nr)
+                         obd_id id, struct ofd_seq *oseq, int nr, int sync)
 {
        struct ofd_thread_info  *info = ofd_info(env);
        struct ofd_object       *fo = NULL;
@@ -162,14 +160,15 @@ int ofd_precreate_objects(const struct lu_env *env, struct ofd_device *ofd,
        ENTRY;
 
        /* Don't create objects beyond the valid range for this SEQ */
-       if (unlikely(fid_seq_is_mdt0(oseq->os_seq) && (id + nr) >= IDIF_MAX_OID)) {
-               CERROR("%s:"POSTID" hit the IDIF_MAX_OID (1<<48)!\n",
-                      ofd_name(ofd), id, oseq->os_seq);
+       if (unlikely(fid_seq_is_mdt0(ostid_seq(&oseq->os_oi)) &&
+                    (id + nr) >= IDIF_MAX_OID)) {
+               CERROR("%s:"DOSTID" hit the IDIF_MAX_OID (1<<48)!\n",
+                      ofd_name(ofd), id, ostid_seq(&oseq->os_oi));
                RETURN(rc = -ENOSPC);
-       } else if (unlikely(!fid_seq_is_mdt0(oseq->os_seq) &&
+       } else if (unlikely(!fid_seq_is_mdt0(ostid_seq(&oseq->os_oi)) &&
                            (id + nr) >= OBIF_MAX_OID)) {
-               CERROR("%s:"POSTID" hit the OBIF_MAX_OID (1<<32)!\n",
-                      ofd_name(ofd), id, oseq->os_seq);
+               CERROR("%s:"DOSTID" hit the OBIF_MAX_OID (1<<32)!\n",
+                      ofd_name(ofd), id, ostid_seq(&oseq->os_oi));
                RETURN(rc = -ENOSPC);
        }
 
@@ -195,11 +194,10 @@ int ofd_precreate_objects(const struct lu_env *env, struct ofd_device *ofd,
        info->fti_attr.la_ctime = 0;
 
        /* prepare objects */
+       ostid_set_seq(&info->fti_ostid, ostid_seq(&oseq->os_oi));
        for (i = 0; i < nr; i++) {
-               info->fti_ostid.oi_id = id + i;
-               info->fti_ostid.oi_seq = oseq->os_seq;
-
-               rc = fid_ostid_unpack(&info->fti_fid, &info->fti_ostid, 0);
+               ostid_set_id(&info->fti_ostid, id + i);
+               rc = ostid_to_fid(&info->fti_fid, &info->fti_ostid, 0);
                if (rc) {
                        if (i == 0)
                                GOTO(out, rc = PTR_ERR(fo));
@@ -228,6 +226,8 @@ int ofd_precreate_objects(const struct lu_env *env, struct ofd_device *ofd,
        if (IS_ERR(th))
                GOTO(out, rc = PTR_ERR(th));
 
+       th->th_sync |= sync;
+
        rc = dt_declare_record_write(env, oseq->os_lastid_obj, sizeof(tmp),
                                     info->fti_off, th);
        if (rc)
@@ -240,7 +240,7 @@ int ofd_precreate_objects(const struct lu_env *env, struct ofd_device *ofd,
                if (unlikely(ofd_object_exists(fo))) {
                        /* object may exist being re-created by write replay */
                        CDEBUG(D_INODE, "object "LPX64"/"LPX64" exists: "
-                              DFID"\n", oseq->os_seq, id,
+                              DFID"\n", ostid_seq(&oseq->os_oi), id,
                               PFID(&info->fti_fid));
                        continue;
                }
@@ -260,7 +260,8 @@ int ofd_precreate_objects(const struct lu_env *env, struct ofd_device *ofd,
        if (rc)
                GOTO(trans_stop, rc);
 
-       CDEBUG(D_OTHER, "create new object "DFID"\n", PFID(&info->fti_fid));
+       CDEBUG(D_OTHER, "%s: create new object "DFID" nr %d\n",
+              ofd_name(ofd), PFID(&info->fti_fid), nr);
 
        for (i = 0; i < nr; i++) {
                fo = batch[i];