b=442

Remove lli_intent_lock_handle that none of us seem to have an explanation for.

diff --git a/lustre/include/linux/lustre_lite.h b/lustre/include/linux/lustre_lite.h
index 5a870c9..4da319d 100644 (file)
--- a/lustre/include/linux/lustre_lite.h
+++ b/lustre/include/linux/lustre_lite.h
@@ -55,7 +55,6 @@ struct ll_read_inode2_cookie {
 struct ll_inode_info {
         struct lov_stripe_md *lli_smd;
         char                 *lli_symlink_name;
-        struct lustre_handle  lli_intent_lock_handle;
         struct semaphore      lli_open_sem;
         atomic_t              lli_open_count; /* see ll_file_release */
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0))

diff --git a/lustre/llite/namei.c b/lustre/llite/namei.c
index 7498c94..d3e5769 100644 (file)
--- a/lustre/llite/namei.c
+++ b/lustre/llite/namei.c
@@ -316,7 +316,7 @@ int ll_intent_lock(struct inode *parent, struct dentry **de,
                  * request, for which we are very thankful.  move along with
                  * the local lookup then. */
 
-                memcpy(&lli->lli_intent_lock_handle, &lockh, sizeof(lockh));
+                //memcpy(&lli->lli_intent_lock_handle, &lockh, sizeof(lockh));
                 offset = 0;
 
                 ino = ll_inode_by_name(parent, dentry, &mode);
@@ -654,8 +654,6 @@ static int ll_create(struct inode *dir, struct dentry *dentry, int mode)
 
         if (it && it->it_disposition) {
                 struct ll_inode_info *lli = ll_i2info(inode);
-                memcpy(&lli->lli_intent_lock_handle, it->it_lock_handle,
-                       sizeof(lli->lli_intent_lock_handle));
                 d_instantiate(dentry, inode);
         } else {
                 /* no directory data updates when intents rule */