LU-2901 ldlm: fix resource/fid check, use DLDLMRES

[fs/lustre-release.git] / lustre / llite / namei.c

diff --git a/lustre/llite/namei.c b/lustre/llite/namei.c
index 64855b1..81bf255 100644 (file)
--- 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);
 
                 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;
 
                 if (bits & MDS_INODELOCK_OPEN) {
                         int flags = 0;