LU-5814 llite: remove lli_has_smd

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

diff --git a/lustre/osd-zfs/osd_oi.c b/lustre/osd-zfs/osd_oi.c
index 279dfb0..0a663fc 100644 (file)
--- a/lustre/osd-zfs/osd_oi.c
+++ b/lustre/osd-zfs/osd_oi.c
@@ -26,10 +26,8 @@
 /*
  * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
- */
-/*
- * Copyright (c) 2012, 2013, Intel Corporation.
- * Use is subject to license terms.
+ *
+ * Copyright (c) 2012, 2014, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -210,7 +208,7 @@ osd_oi_find_or_create(const struct lu_env *env, struct osd_device *o,
  * the object is located (tgt index) and it is MDT or OST object.
  */
 int osd_fld_lookup(const struct lu_env *env, struct osd_device *osd,
-                  obd_seq seq, struct lu_seq_range *range)
+                  u64 seq, struct lu_seq_range *range)
 {
        struct seq_server_site  *ss = osd_seq_site(osd);
 
@@ -264,7 +262,7 @@ int fid_is_on_ost(const struct lu_env *env, struct osd_device *osd,
 }
 
 static struct osd_seq *osd_seq_find_locked(struct osd_seq_list *seq_list,
-                                          obd_seq seq)
+                                          u64 seq)
 {
        struct osd_seq *osd_seq;
 
@@ -275,8 +273,7 @@ static struct osd_seq *osd_seq_find_locked(struct osd_seq_list *seq_list,
        return NULL;
 }
 
-static struct osd_seq *osd_seq_find(struct osd_seq_list *seq_list,
-                                   obd_seq seq)
+static struct osd_seq *osd_seq_find(struct osd_seq_list *seq_list, u64 seq)
 {
        struct osd_seq *osd_seq;
 
@@ -288,7 +285,7 @@ static struct osd_seq *osd_seq_find(struct osd_seq_list *seq_list,
 }
 
 static struct osd_seq *osd_find_or_add_seq(const struct lu_env *env,
-                                          struct osd_device *osd, obd_seq seq)
+                                          struct osd_device *osd, u64 seq)
 {
        struct osd_seq_list     *seq_list = &osd->od_seq_list;
        struct osd_seq          *osd_seq;
@@ -373,7 +370,7 @@ osd_get_idx_for_ost_obj(const struct lu_env *env, struct osd_device *osd,
 {
        struct osd_seq  *osd_seq;
        unsigned long   b;
-       obd_id          id;
+       u64             id;
        int             rc;
 
        osd_seq = osd_find_or_add_seq(env, osd, fid_seq(fid));
@@ -738,7 +735,7 @@ int osd_convert_root_to_new_seq(const struct lu_env *env,
 
        /* declare that we'll add object to fid-dnode mapping */
        newfid.f_seq = FID_SEQ_ROOT;
-       newfid.f_oid = 1;
+       newfid.f_oid = FID_OID_ROOT;
        newfid.f_ver = 0;
        zapid = osd_get_name_n_idx(env, o, &newfid, buf);
        dmu_tx_hold_bonus(tx, zapid);