#include <sys/fcntl.h>
#include <sys/queue.h>
+#ifdef HAVE_XTIO_H
+#include <xtio.h>
+#endif
#include <sysio.h>
#include <fs.h>
#include <mount.h>
#include <inode.h>
+#ifdef HAVE_FILE_H
#include <file.h>
+#endif
#undef LIST_HEAD
{
struct lustre_handle *handle;
- if (it->it_op && it->d.lustre.it_lock_mode) {
- handle = (struct lustre_handle *)&it->d.lustre.it_lock_handle;
+ if (it->it_op && LUSTRE_IT(it)->it_lock_mode) {
+ handle = (struct lustre_handle *)&LUSTRE_IT(it)->it_lock_handle;
CDEBUG(D_DLMTRACE, "releasing lock with cookie "LPX64
" from it %p\n", handle->cookie, it);
- ldlm_lock_decref(handle, it->d.lustre.it_lock_mode);
+ ldlm_lock_decref(handle, LUSTRE_IT(it)->it_lock_mode);
/* bug 494: intent_release may be called multiple times, from
* this thread and we don't want to double-decref this lock */
- it->d.lustre.it_lock_mode = 0;
+ LUSTRE_IT(it)->it_lock_mode = 0;
}
}
ll_intent_drop_lock(it);
it->it_magic = 0;
it->it_op_release = 0;
- it->d.lustre.it_disposition = 0;
- it->d.lustre.it_data = NULL;
+ LUSTRE_IT(it)->it_disposition = 0;
+ LUSTRE_IT(it)->it_data = NULL;
EXIT;
}
CDEBUG(D_DLMTRACE, "setting l_data to inode %p (%lu/%lu)\n",
inode, llu_i2info(inode)->lli_st_ino,
llu_i2info(inode)->lli_st_generation);
- mdc_set_lock_data(NULL, &it->d.lustre.it_lock_handle, inode);
+ mdc_set_lock_data(NULL, &LUSTRE_IT(it)->it_lock_handle, inode);
}
/* drop lookup/getattr locks */
int rc;
ENTRY;
- CDEBUG(D_VFSTRACE, "VFS Op:name=%s,intent=%x\n",
- pb->pb_name.name, it ? it->it_op : 0);
+ CDEBUG(D_VFSTRACE, "VFS Op:name=%.*s,intent=%x\n",
+ (int)pb->pb_name.len, pb->pb_name.name, it ? it->it_op : 0);
/* We don't want to cache negative dentries, so return 0 immediately.
* We believe that this is safe, that negative dentries cannot be
struct inode *llu_inode_from_lock(struct ldlm_lock *lock)
{
struct inode *inode;
- l_lock(&lock->l_resource->lr_namespace->ns_lock);
+#warning "fix l_lock() using here!"
+// l_lock(&lock->l_resource->lr_namespace->ns_lock);
if (lock->l_ast_data) {
inode = (struct inode *)lock->l_ast_data;
} else
inode = NULL;
- l_unlock(&lock->l_resource->lr_namespace->ns_lock);
+// l_unlock(&lock->l_resource->lr_namespace->ns_lock);
return inode;
}