X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fllite%2Fnamei.c;h=81bf255d52949ee8f37c451a5b6a70ecb8639f5e;hp=64855b1bf4754b77208ccba3538626907a9914ff;hb=a1052417b78bc18898161c4ed44d79de4a1a2f23;hpb=7cd460776da349643f53cda4c5d4e927316b666e

diff --git a/lustre/llite/namei.c b/lustre/llite/namei.c
index 64855b1..81bf255 100644
--- a/lustre/llite/namei.c
+++ b/lustre/llite/namei.c
@@ -236,13 +236,10 @@ int ll_md_blocking_ast(struct ldlm_lock *lock, struct ldlm_lock_desc *desc,
                 if (bits & MDS_INODELOCK_OPEN)
                         ll_have_md_lock(inode, &bits, mode);
 
-                fid = ll_inode2fid(inode);
-                if (lock->l_resource->lr_name.name[0] != fid_seq(fid) ||
-                    lock->l_resource->lr_name.name[1] != fid_oid(fid) ||
-                    lock->l_resource->lr_name.name[2] != fid_ver(fid)) {
-                        LDLM_ERROR(lock, "data mismatch with object "
-                                   DFID" (%p)", PFID(fid), inode);
-                }
+		fid = ll_inode2fid(inode);
+		if (!fid_res_name_eq(fid, &lock->l_resource->lr_name))
+			LDLM_ERROR(lock, "data mismatch with object "
+				   DFID" (%p)", PFID(fid), inode);
 
                 if (bits & MDS_INODELOCK_OPEN) {
                         int flags = 0;