* Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
*
- * Copyright (c) 2011, 2012, Whamcloud, Inc.
+ * Copyright (c) 2012, 2013, Intel Corporation.
*/
/*
* This file is part of Lustre, http://www.lustre.org/
#define DEBUG_SUBSYSTEM S_FILTER
#include <dt_object.h>
+#include <lustre/lustre_idl.h>
#include "ofd_internal.h"
info->fti_pre_version != curr_version) {
CDEBUG(D_INODE, "Version mismatch "LPX64" != "LPX64"\n",
info->fti_pre_version, curr_version);
- cfs_spin_lock(&info->fti_exp->exp_lock);
+ spin_lock(&info->fti_exp->exp_lock);
info->fti_exp->exp_vbr_failed = 1;
- cfs_spin_unlock(&info->fti_exp->exp_lock);
+ spin_unlock(&info->fti_exp->exp_lock);
RETURN (-EOVERFLOW);
}
info->fti_pre_version = curr_version;
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;
* 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) {
/*
}
int ofd_precreate_objects(const struct lu_env *env, struct ofd_device *ofd,
- obd_id id, obd_seq seq, 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;
ENTRY;
/* Don't create objects beyond the valid range for this SEQ */
- if (unlikely(fid_seq_is_mdt0(seq) && (id + nr) >= IDIF_MAX_OID)) {
- CERROR("%s:"POSTID" hit the IDIF_MAX_OID (1<<48)!\n",
- ofd_name(ofd), id, 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(seq) &&
- (id + nr) >= OBIF_MAX_OID)) {
- CERROR("%s:"POSTID" hit the OBIF_MAX_OID (1<<32)!\n",
- ofd_name(ofd), id, seq);
+ } else if (unlikely(!fid_seq_is_mdt0(ostid_seq(&oseq->os_oi)) &&
+ (id + nr) >= OBIF_MAX_OID)) {
+ CERROR("%s:"DOSTID" hit the OBIF_MAX_OID (1<<32)!\n",
+ ofd_name(ofd), id, ostid_seq(&oseq->os_oi));
RETURN(rc = -ENOSPC);
}
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 = 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));
if (IS_ERR(th))
GOTO(out, rc = PTR_ERR(th));
- rc = dt_declare_record_write(env, ofd->ofd_lastid_obj[seq],
- sizeof(tmp), info->fti_off, th);
+ th->th_sync |= sync;
+
+ rc = dt_declare_record_write(env, oseq->os_lastid_obj, sizeof(tmp),
+ info->fti_off, th);
if (rc)
GOTO(trans_stop, rc);
if (unlikely(ofd_object_exists(fo))) {
/* object may exist being re-created by write replay */
- CDEBUG(D_INODE, "object "LPD64"/"LPD64" exists: "
- DFID"\n", seq, id, PFID(&info->fti_fid));
+ CDEBUG(D_INODE, "object "LPX64"/"LPX64" exists: "
+ DFID"\n", ostid_seq(&oseq->os_oi), id,
+ PFID(&info->fti_fid));
continue;
}
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];
break;
LASSERT(ofd_object_exists(fo));
}
- ofd_last_id_set(ofd, id + i, seq);
+ ofd_seq_last_oid_set(oseq, id + i);
}
objects = i;
if (objects > 0) {
- tmp = cpu_to_le64(ofd_last_id(ofd, seq));
- rc = dt_record_write(env, ofd->ofd_lastid_obj[seq],
+ tmp = cpu_to_le64(ofd_seq_last_oid(oseq));
+ rc = dt_record_write(env, oseq->os_lastid_obj,
&info->fti_buf, &info->fti_off, th);
}
trans_stop: