LU-6038 osd-zfs: Avoid redefining KM_SLEEP

[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 5b427a9..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/
@@ -737,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);