From: alex <alex>
Date: Tue, 21 Jul 2009 17:39:58 +0000 (+0000)
Subject: - another merge issue is fixed
X-Git-Tag: GIT_EPOCH_B_HD_KDMU~2^4~75
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=d8b6a19e9e052455a66925b0e331f6693e55a2b9;p=fs%2Flustre-release.git

- another merge issue is fixed
---

diff --git a/lustre/osd/osd_handler.c b/lustre/osd/osd_handler.c
index a6c1294..da18ed4 100644
--- a/lustre/osd/osd_handler.c
+++ b/lustre/osd/osd_handler.c
@@ -303,7 +303,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) || fid_is_idif(fid));
         /*
          * This assertion checks that osd layer sees only local
          * fids. Unfortunately it is somewhat expensive (does a