lock = ldlm_handle2lock(lockh);
LASSERT(lock != NULL);
- l_lock(&lock->l_resource->lr_namespace->ns_lock);
+ lock_res_and_lock(lock);
#ifdef __KERNEL__
if (lock->l_ast_data && lock->l_ast_data != data) {
struct inode *new_inode = data;
}
#endif
lock->l_ast_data = data;
- l_unlock(&lock->l_resource->lr_namespace->ns_lock);
+ unlock_res_and_lock(lock);
LDLM_LOCK_PUT(lock);
EXIT;
req->rq_replen = lustre_msg_size(5, repsize);
} else if (it->it_op & (IT_GETATTR | IT_LOOKUP | IT_CHDIR)) {
__u64 valid = data->valid | OBD_MD_FLNOTOBD | OBD_MD_FLEASIZE |
- OBD_MD_FLACL_ACCESS;
+ OBD_MD_FLACL;
+
+ /* we don't expect xattr retrieve could reach here */
+ LASSERT(!(valid & (OBD_MD_FLXATTR | OBD_MD_FLXATTRLIST)));
reqsize[req_buffers++] = sizeof(struct mds_body);
reqsize[req_buffers++] = data->namelen + 1;