b=19427 correct lmm_object_id and reserve fids for fid-on-OST.

[fs/lustre-release.git] / lustre / osd / osd_handler.c

diff --git a/lustre/osd/osd_handler.c b/lustre/osd/osd_handler.c
index b826a71..e9e5d2c 100644 (file)
--- a/lustre/osd/osd_handler.c
+++ b/lustre/osd/osd_handler.c
@@ -257,7 +257,7 @@ static int osd_root_get(const struct lu_env *env,
         struct inode *inode;
 
         inode = osd_sb(osd_dt_dev(dev))->s_root->d_inode;
-        lu_igif_build(f, inode->i_ino, inode->i_generation);
+        LU_IGIF_BUILD(f, inode->i_ino, inode->i_generation);
         return 0;
 }
 
@@ -347,7 +347,7 @@ static int osd_fid_lookup(const struct lu_env *env,
 
         LINVRNT(osd_invariant(obj));
         LASSERT(obj->oo_inode == NULL);
-        LASSERT(fid_is_sane(fid));
+        LASSERT(fid_is_sane(fid) || osd_fid_is_root(fid));
         /*
          * This assertion checks that osd layer sees only local
          * fids. Unfortunately it is somewhat expensive (does a
@@ -1720,7 +1720,7 @@ static int osd_ea_fid_set(const struct lu_env *env, struct dt_object *dt,
 static inline void osd_igif_get(const struct lu_env *env, struct inode  *inode,
                                 struct lu_fid *fid)
 {
-        lu_igif_build(fid, inode->i_ino, inode->i_generation);
+        LU_IGIF_BUILD(fid, inode->i_ino, inode->i_generation);
 }
 
 /**