Merge "LU-9771 flr: Merge branch 'flr'"

[fs/lustre-release.git] / lustre / mdt / mdt_open.c

diff --git a/lustre/mdt/mdt_open.c b/lustre/mdt/mdt_open.c
index 56cc5fd..3b684d4 100644 (file)
--- a/lustre/mdt/mdt_open.c
+++ b/lustre/mdt/mdt_open.c
@@ -1141,12 +1141,9 @@ out_unlock:
                mdt_object_open_unlock(info, o, lhc, ibits, rc);
 out:
        mdt_object_put(env, o);
-       if (rc == 0) {
-               rc = mdt_pack_size2body(info, rr->rr_fid2,
-                                       ibits & MDS_INODELOCK_DOM);
-               LASSERT(ergo(ibits & MDS_INODELOCK_DOM, !rc));
-               rc = 0;
-       }
+       if (rc == 0)
+               mdt_pack_size2body(info, rr->rr_fid2,
+                                  ibits & MDS_INODELOCK_DOM);
 out_parent_put:
        if (parent != NULL)
                mdt_object_put(env, parent);
@@ -1603,12 +1600,8 @@ out_child_unlock:
                mdt_object_open_unlock(info, child, lhc, ibits, result);
 out_child:
        mdt_object_put(info->mti_env, child);
-       if (result == 0) {
-               rc = mdt_pack_size2body(info, child_fid,
-                                       ibits & MDS_INODELOCK_DOM);
-               LASSERT(ergo(ibits & MDS_INODELOCK_DOM, !rc));
-               rc = 0;
-       }
+       if (result == 0)
+               mdt_pack_size2body(info, child_fid, ibits & MDS_INODELOCK_DOM);
 out_parent:
        mdt_object_unlock_put(info, parent, lh, result || !created);
 out: