Whamcloud - gitweb
b=6274
[fs/lustre-release.git] / lustre / smfs / dir.c
index b26cca9..6be2ddd 100644 (file)
 #include <linux/lustre_fsfilt.h>
 #include <linux/lustre_smfs.h>
 #include <linux/lustre_snap.h>
-
+#include <linux/security.h>
 #include "smfs_internal.h"
 
-#define NAME_ALLOC_LEN(len)     ((len+16) & ~15)
+//#define NAME_ALLOC_LEN(len)     ((len+16) & ~15)
 
 #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))
 static int smfs_create(struct inode *dir, struct dentry *dentry,
@@ -49,25 +49,24 @@ static int smfs_create(struct inode *dir, struct dentry *dentry,
                        int mode, struct nameidata *nd)
 #endif
 {
-        struct inode  *inode = NULL;
-        struct inode  *cache_dir = NULL;
+        struct inode *inode = NULL;
+        struct inode *parent = I2CI(dentry->d_parent->d_inode);
+        struct inode *cache_dir = I2CI(dir);
         struct dentry *cache_dentry = NULL;
         struct dentry *cache_parent = NULL;
         void *handle = NULL;
         struct hook_msg msg = {
-                .dir = dir,
                 .dentry = dentry,
         };
         int rc = 0;
         
         ENTRY;
 
-        cache_dir = I2CI(dir);
         LASSERT(cache_dir);
         LASSERT(cache_dir->i_op->create);
 
         //lock_kernel();
-        cache_parent = pre_smfs_dentry(NULL, cache_dir, dentry);
+        cache_parent = pre_smfs_dentry(NULL, parent, dentry->d_parent);
         cache_dentry = pre_smfs_dentry(cache_parent, NULL, dentry);
         if (!cache_dentry || !cache_parent) {
                 rc = -ENOMEM;
@@ -80,7 +79,7 @@ static int smfs_create(struct inode *dir, struct dentry *dentry,
                 goto exit;
         }
         
-        SMFS_PRE_HOOK(dir->i_sb, HOOK_CREATE, &msg);
+        SMFS_PRE_HOOK(dir, HOOK_CREATE, &msg);
 
         pre_smfs_inode(dir, cache_dir);
 
@@ -89,15 +88,17 @@ static int smfs_create(struct inode *dir, struct dentry *dentry,
 #else
         rc = cache_dir->i_op->create(cache_dir, cache_dentry, mode, nd);
 #endif
-        if (!rc) {        
-                inode = smfs_get_inode(dir->i_sb, cache_dentry->d_inode->i_ino, dir, 0);
-                if (inode)
+        if (!rc) {
+                inode = smfs_get_inode(dir->i_sb, cache_dentry->d_inode->i_ino,
+                                       dir, 0);
+                if (inode) {
                         d_instantiate(dentry, inode);
+                }
                 else
                         rc = -ENOENT;
         }
         
-        SMFS_POST_HOOK(dir->i_sb, HOOK_CREATE, &msg, rc); 
+        SMFS_POST_HOOK(dir, HOOK_CREATE, &msg, rc); 
 
         post_smfs_inode(dir, cache_dir);
         smfs_trans_commit(dir, handle, 0);
@@ -109,22 +110,73 @@ exit:
         RETURN(rc);
 }
 
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))
-static struct dentry *smfs_lookup(struct inode *dir, struct dentry *dentry)
-#else
-static struct dentry *smfs_lookup(struct inode *dir, struct dentry *dentry,
-                                  struct nameidata *nd)
-#endif
+static struct dentry * iopen_connect_dentry(struct dentry * dentry,
+                                     struct inode *inode, int rehash)
 {
-        struct inode *cache_dir;
-        struct inode *inode = NULL;
-        struct inode * cache_inode = NULL;
+       struct dentry *tmp, *goal = NULL;
+       struct list_head *lp;
+
+       /* verify this dentry is really new */
+       LASSERT(dentry->d_inode == NULL);
+       LASSERT(list_empty(&dentry->d_alias));          /* d_instantiate */
+       if (rehash)
+               LASSERT(d_unhashed(dentry));    /* d_rehash */
+       LASSERT(list_empty(&dentry->d_subdirs));
+
+       spin_lock(&dcache_lock);
+       if (!inode)
+               goto do_rehash;
+
+       /* preferrably return a connected dentry */
+       list_for_each(lp, &inode->i_dentry) {
+               tmp = list_entry(lp, struct dentry, d_alias);
+               if (tmp->d_flags & DCACHE_DISCONNECTED) {
+                       LASSERT(tmp->d_alias.next == &inode->i_dentry);
+                       LASSERT(tmp->d_alias.prev == &inode->i_dentry);
+                       goal = tmp;
+                       dget_locked(goal);
+                       break;
+               }
+       }
+
+       if (!goal)
+               goto do_instantiate;
+
+       /* Move the goal to the de hash queue */
+       goal->d_flags &= ~ DCACHE_DISCONNECTED;
+       security_d_instantiate(goal, inode);
+        __d_rehash(dentry);
+        __d_move(goal, dentry);
+       spin_unlock(&dcache_lock);
+       iput(inode);
+
+       RETURN(goal);
+
+       /* d_add(), but don't drop dcache_lock before adding dentry to inode */
+do_instantiate:
+       list_add(&dentry->d_alias, &inode->i_dentry);   /* d_instantiate */
+       dentry->d_inode = inode;
+do_rehash:
+       if (rehash)
+                __d_rehash(dentry);
+       spin_unlock(&dcache_lock);
+
+       RETURN(NULL);
+
+}
+
+static int smfs_do_lookup (struct inode * dir, 
+                           struct dentry * dentry,
+                           struct nameidata *nd,
+                           struct inode **inode)
+{
+        struct inode *cache_dir = I2CI(dir);
+        struct inode *parent = I2CI(dentry->d_parent->d_inode);
         struct dentry *cache_dentry = NULL;
         struct dentry *cache_parent = NULL;
-        struct dentry *rdentry = NULL;
+        struct dentry *rdentry = NULL, *tmp = NULL;
         int rc = 0;
         struct hook_msg msg = {
-                .dir = dir,
                 .dentry = dentry,
         };
 
@@ -132,79 +184,150 @@ static struct dentry *smfs_lookup(struct inode *dir, struct dentry *dentry,
         
         cache_dir = I2CI(dir);
         if (!cache_dir)
-                RETURN(ERR_PTR(-ENOENT));
+                RETURN(-ENOENT);
 
         LASSERT(cache_dir->i_op->lookup);
 
         /* preparing artificial backing fs dentries. */
-        cache_parent = pre_smfs_dentry(NULL, cache_dir, dentry->d_parent);
+        cache_parent = pre_smfs_dentry(NULL, parent, dentry->d_parent);
         cache_dentry = pre_smfs_dentry(cache_parent, NULL, dentry);
-        if (!cache_dentry || !cache_parent) 
-                RETURN(ERR_PTR(-ENOMEM));
+        if (!cache_dentry || !cache_parent) {
+                rc = -ENOMEM;
+                goto exit;
+        }
+        
+        SMFS_PRE_HOOK(dir, HOOK_LOOKUP, &msg);
         
-        SMFS_PRE_HOOK(dir->i_sb, HOOK_LOOKUP, &msg); 
-
         /* perform lookup in backing fs. */
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))
-        rdentry = cache_dir->i_op->lookup(cache_dir, cache_dentry);
-#else
         rdentry = cache_dir->i_op->lookup(cache_dir, cache_dentry, nd);
-#endif
         if (rdentry) {
-                if (IS_ERR(rdentry))
+                if (IS_ERR(rdentry)) {
                         rc = PTR_ERR(rdentry);
+                        rdentry = NULL;
+                }
                 else {
-                        cache_inode = rdentry->d_inode;
-                        dput(rdentry);
+                        tmp = rdentry;
+                        //copy fields if DCACHE_CROSS_REF
+                        smfs_update_dentry(dentry, tmp);
                 }
-        } else {
-                cache_inode = cache_dentry->d_inode;
+        } else 
+                tmp = cache_dentry;
+        
+        SMFS_POST_HOOK(dir, HOOK_LOOKUP, &msg, rc);
+     
+        if (tmp && tmp->d_inode) {
+                *inode = smfs_get_inode(dir->i_sb, tmp->d_inode->i_ino, 
+                                        dir, 0); 
+                if (!(*inode))
+                        rc = -ENOENT;
         }
         
-        if (cache_inode) { 
-                inode = smfs_get_inode(dir->i_sb, cache_inode->i_ino, dir,0);
-                if (!inode)
-                        rc = -ENOENT;
+        if (rdentry) {
+                LASSERT(atomic_read(&rdentry->d_count) > 0);
+                dput(rdentry);
         }
-
-        if (!rc)
-                d_add(dentry, inode);
         
-        SMFS_POST_HOOK(dir->i_sb, HOOK_LOOKUP, &msg, rc);
-exit:        
+exit:
         post_smfs_dentry(cache_dentry);
         post_smfs_dentry(cache_parent);
-        RETURN(ERR_PTR(rc));
+        
+        RETURN(rc);
+}
+
+static struct dentry * smfs_iopen_lookup(struct inode * dir, 
+                                         struct dentry *dentry,
+                                        struct nameidata *nd)
+{
+        struct dentry * alternate = NULL;
+       struct inode *inode = NULL;
+        int rc = 0;
+        ENTRY;
+        
+        rc = smfs_do_lookup(dir, dentry, nd, &inode);
+       if (rc)
+                RETURN(ERR_PTR(rc));
+        
+        LASSERT(inode);
+        /* preferrably return a connected dentry */
+       spin_lock(&dcache_lock);
+       list_for_each_entry(alternate, &inode->i_dentry, d_alias) {
+               LASSERT(!(alternate->d_flags & DCACHE_DISCONNECTED));
+       }
+
+       list_for_each_entry(alternate, &inode->i_dentry, d_alias) {
+               dget_locked(alternate);
+               spin_lock(&alternate->d_lock);
+               alternate->d_flags |= DCACHE_REFERENCED;
+               spin_unlock(&alternate->d_lock);
+               iput(inode);
+               spin_unlock(&dcache_lock);
+               RETURN(alternate);
+       }
+        
+       dentry->d_flags |= DCACHE_DISCONNECTED;
+
+       /* d_add(), but don't drop dcache_lock before adding dentry to inode */
+       list_add(&dentry->d_alias, &inode->i_dentry);   /* d_instantiate */
+       dentry->d_inode = inode;
+
+       __d_rehash(dentry);                             /* d_rehash */
+       spin_unlock(&dcache_lock);
+
+       return NULL;
+}
+
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))
+static struct dentry *smfs_lookup(struct inode *dir, struct dentry *dentry)
+#else
+static struct dentry *smfs_lookup(struct inode *dir, struct dentry *dentry,
+                                  struct nameidata *nd)
+#endif
+{
+        struct dentry * rdentry = NULL;
+        struct inode * inode = NULL;
+        int rc;
+        
+        rc = smfs_do_lookup(dir, dentry, nd, &inode);
+        if (rc)
+                RETURN(ERR_PTR(rc));
+        
+        //lmv stuff. Special dentry that has no inode.
+        if (dentry->d_flags & DCACHE_CROSS_REF) {
+                d_add(dentry, NULL);
+                RETURN(NULL);
+        }
+        //TODO: should flags be checked and copied before?        
+        rdentry = iopen_connect_dentry(dentry, inode, 1);
+        
+        RETURN(rdentry);
 }
 
 static int smfs_link(struct dentry *old_dentry,
                      struct inode *dir, struct dentry *dentry)
 {
-        struct inode *cache_old_inode = NULL;
-        struct inode *cache_dir = NULL;
-        struct inode *old_inode = NULL;
-        struct dentry *cache_dentry = NULL;
+        struct inode *parent = I2CI(dentry->d_parent->d_inode);
+        struct inode *cache_dir = I2CI(dir);
+        struct inode *old_inode = old_dentry->d_inode;
+        struct inode *cache_old_inode = I2CI(old_inode);
         struct dentry *cache_old_dentry = NULL;
+        struct dentry *cache_dentry = NULL;
         struct dentry *cache_parent = NULL;
         void *handle = NULL;
         int rc = 0;
-        struct hook_msg msg = {
-                .dir = dir,
+        struct hook_link_msg msg = {
                 .dentry = old_dentry,
+                .new_dentry = dentry
         };
 
         ENTRY;
 
-        cache_dir = I2CI(dir);
         if (!cache_dir)
                 RETURN(-ENOENT);
         
-        old_inode = old_dentry->d_inode;        
-        cache_old_inode = I2CI(old_inode);
         if (!cache_old_inode)
                 RETURN(-ENOENT);
         
-        cache_parent = pre_smfs_dentry(NULL, cache_dir, dentry);
+        cache_parent = pre_smfs_dentry(NULL, parent, dentry->d_parent);
         cache_dentry = pre_smfs_dentry(cache_parent, NULL, dentry);
         cache_old_dentry = pre_smfs_dentry(NULL, cache_old_inode, old_dentry);
         if (!cache_old_dentry || !cache_dentry || !cache_parent) {
@@ -222,15 +345,15 @@ static int smfs_link(struct dentry *old_dentry,
         pre_smfs_inode(old_inode, cache_old_inode);
 
         //lock_kernel();
-        SMFS_PRE_HOOK(dir->i_sb, HOOK_LINK, &msg); 
+        SMFS_PRE_HOOK(dir, HOOK_LINK, &msg); 
 
         rc = cache_dir->i_op->link(cache_old_dentry, cache_dir, cache_dentry);
         if (!rc) {
                 atomic_inc(&old_inode->i_count);
-                d_instantiate(dentry, old_inode);
+                dput(iopen_connect_dentry(dentry, old_inode, 0));
         }
 
-        SMFS_POST_HOOK(dir->i_sb, HOOK_LINK, &msg, rc); 
+        SMFS_POST_HOOK(dir, HOOK_LINK, &msg, rc); 
         
         post_smfs_inode(old_inode, cache_old_inode);
         post_smfs_inode(dir, cache_dir);
@@ -250,23 +373,25 @@ static int smfs_unlink(struct inode * dir, struct dentry *dentry)
 {
         struct inode *cache_dir = I2CI(dir);
         struct inode *cache_inode = I2CI(dentry->d_inode);
-        struct dentry *cache_dentry;
-        struct dentry *cache_parent;
+        struct inode *parent = I2CI(dentry->d_parent->d_inode);
+        struct dentry *cache_dentry = NULL;
+        struct dentry *cache_parent = NULL;
         void   *handle = NULL;
         int    rc = 0;
         //int    mode = 0;
         struct hook_unlink_msg msg = {
-                .dir = dir,
                 .dentry = dentry,
                 .mode = 0
         };
 
         ENTRY;
         
-        if (!cache_dir || !cache_inode || !cache_dir->i_op->unlink)
-                RETURN(-ENOENT);
-
-        cache_parent = pre_smfs_dentry(NULL, cache_dir, dentry);
+        LASSERT(cache_dir);
+        LASSERT(cache_inode);
+        LASSERT(cache_dir->i_op->unlink);
+        LASSERT(parent);
+        
+        cache_parent = pre_smfs_dentry(NULL, parent, dentry->d_parent);
         cache_dentry = pre_smfs_dentry(cache_parent, cache_inode, dentry);
         if (!cache_dentry || !cache_parent) {
                 rc = -ENOMEM;
@@ -283,11 +408,11 @@ static int smfs_unlink(struct inode * dir, struct dentry *dentry)
         pre_smfs_inode(dir, cache_dir);
         pre_smfs_inode(dentry->d_inode, cache_inode);
 
-        SMFS_PRE_HOOK(dir->i_sb, HOOK_UNLINK, &msg); 
+        SMFS_PRE_HOOK(dir, HOOK_UNLINK, &msg); 
         
         rc = cache_dir->i_op->unlink(cache_dir, cache_dentry);
                 
-        SMFS_POST_HOOK(dir->i_sb, HOOK_UNLINK, &msg, rc); 
+        SMFS_POST_HOOK(dir, HOOK_UNLINK, &msg, rc); 
 
         post_smfs_inode(dentry->d_inode, cache_dentry->d_inode);
         post_smfs_inode(dir, cache_dir);
@@ -305,12 +430,12 @@ static int smfs_symlink(struct inode *dir, struct dentry *dentry,
 {
         struct inode *cache_dir = I2CI(dir);
         struct inode *inode = NULL;
-        struct dentry *cache_dentry;
-        struct dentry *cache_parent;
+        struct inode *parent = I2CI(dentry->d_parent->d_inode);
+        struct dentry *cache_dentry = NULL;
+        struct dentry *cache_parent = NULL;
         void   *handle = NULL;
         int    rc = 0;
         struct hook_symlink_msg msg = {
-                .dir = dir,
                 .dentry = dentry,
                 .tgt_len = strlen(symname) + 1,
                 .symname = (char*)symname
@@ -318,10 +443,11 @@ static int smfs_symlink(struct inode *dir, struct dentry *dentry,
 
         ENTRY;
         
-        if (!cache_dir || !cache_dir->i_op->symlink)
-                RETURN(-ENOENT);
+        LASSERT(cache_dir);
+        LASSERT(cache_dir->i_op->symlink);
+        LASSERT(parent);
 
-        cache_parent = pre_smfs_dentry(NULL, cache_dir, dentry);
+        cache_parent = pre_smfs_dentry(NULL, parent, dentry->d_parent);
         cache_dentry = pre_smfs_dentry(cache_parent, NULL, dentry);
         if (!cache_parent || !cache_dentry) {
                 rc = -ENOMEM;
@@ -337,19 +463,21 @@ static int smfs_symlink(struct inode *dir, struct dentry *dentry,
         //lock_kernel();
         pre_smfs_inode(dir, cache_dir);
 
-        SMFS_PRE_HOOK(dir->i_sb, HOOK_SYMLINK, &msg); 
+        SMFS_PRE_HOOK(dir, HOOK_SYMLINK, &msg); 
         
         rc = cache_dir->i_op->symlink(cache_dir, cache_dentry, symname);
         if (!rc) {        
                 inode = smfs_get_inode(dir->i_sb, cache_dentry->d_inode->i_ino,
                                        dir, 0);
-                if (inode)
+                if (inode) {
+                        //smfs_update_dentry(dentry, cache_dentry);
                         d_instantiate(dentry, inode);
+                }
                 else
                         rc = -ENOENT;
         }
         
-        SMFS_POST_HOOK(dir->i_sb, HOOK_SYMLINK, &msg, rc);
+        SMFS_POST_HOOK(dir, HOOK_SYMLINK, &msg, rc);
         
         post_smfs_inode(dir, cache_dir);
         smfs_trans_commit(dir, handle, 0);
@@ -361,28 +489,26 @@ exit:
         RETURN(rc);
 }
 
-static int smfs_mkdir(struct inode *dir, struct dentry *dentry,
-                      int mode)
+static int smfs_mkdir(struct inode *dir, struct dentry *dentry, int mode)
 {
         struct inode *cache_dir = I2CI(dir);
+        struct inode *parent = I2CI(dentry->d_parent->d_inode);
         struct inode *inode = NULL;
-        struct dentry *cache_dentry;
-        struct dentry *cache_parent;
+        struct dentry *cache_dentry = NULL;
+        struct dentry *cache_parent = NULL;
         void   *handle = NULL;
         int    rc = 0;
         struct hook_msg msg = {
-                .dir = dir,
                 .dentry = dentry,
         };
 
         ENTRY;
         
-        if (!cache_dir)
-                RETURN(-ENOENT);
-
-        cache_parent = pre_smfs_dentry(NULL, cache_dir, dentry);
+        LASSERT(cache_dir);
+        LASSERT(parent);
+        
+        cache_parent = pre_smfs_dentry(NULL, parent, dentry->d_parent);
         cache_dentry = pre_smfs_dentry(cache_parent, NULL, dentry);
-
         if (!cache_parent || !cache_dentry) {
                 rc = -ENOMEM;
                 goto exit;
@@ -395,19 +521,21 @@ static int smfs_mkdir(struct inode *dir, struct dentry *dentry,
         }
         
         pre_smfs_inode(dir, cache_dir);
-        SMFS_PRE_HOOK(dir->i_sb, HOOK_MKDIR, &msg); 
+        SMFS_PRE_HOOK(dir, HOOK_MKDIR, &msg); 
         
         rc = cache_dir->i_op->mkdir(cache_dir, cache_dentry, mode);
         if (!rc) {
                 inode = smfs_get_inode(dir->i_sb, cache_dentry->d_inode->i_ino,
                                        dir, 0);
-                if (inode)
+                if (inode) {
+                        //smsf_update_dentry(dentry, cache_dentry);
                         d_instantiate(dentry, inode);
+                }
                 else
                         rc = -ENOENT;
         }
 
-        SMFS_POST_HOOK(dir->i_sb, HOOK_MKDIR, &msg, rc); 
+        SMFS_POST_HOOK(dir, HOOK_MKDIR, &msg, rc); 
         post_smfs_inode(dir, cache_dir);
         smfs_trans_commit(dir, handle, 0);
 
@@ -421,22 +549,23 @@ static int smfs_rmdir(struct inode *dir, struct dentry *dentry)
 {
         struct inode *cache_dir = I2CI(dir);
         struct inode *cache_inode = I2CI(dentry->d_inode);
+        struct inode *parent = I2CI(dentry->d_parent->d_inode);
         struct dentry *cache_dentry = NULL;
         struct dentry *cache_parent = NULL;
         void *handle = NULL;
         int    rc = 0;
         struct hook_unlink_msg msg = {
-                .dir = dir,
                 .dentry = dentry,
                 .mode = S_IFDIR
         };
 
         ENTRY;
         
-        if (!cache_dir || !cache_dir->i_op->rmdir)
-                RETURN(-ENOENT);
+        LASSERT(cache_dir);
+        LASSERT(cache_dir->i_op->rmdir);
+        LASSERT(parent);
 
-        cache_parent = pre_smfs_dentry(NULL, cache_dir, dentry);
+        cache_parent = pre_smfs_dentry(NULL, parent, dentry->d_parent);
         cache_dentry = pre_smfs_dentry(cache_parent, cache_inode, dentry);
         if (!cache_parent || !cache_dentry) {
                 rc = -ENOMEM;
@@ -452,15 +581,18 @@ static int smfs_rmdir(struct inode *dir, struct dentry *dentry)
         pre_smfs_inode(dir, cache_dir);
         pre_smfs_inode(dentry->d_inode, cache_dentry->d_inode);
         
-        SMFS_PRE_HOOK(dir->i_sb, HOOK_RMDIR, &msg); 
-
+        SMFS_PRE_HOOK(dir, HOOK_RMDIR, &msg); 
+        
         rc = cache_dir->i_op->rmdir(cache_dir, cache_dentry);
               
-        SMFS_POST_HOOK(dir->i_sb, HOOK_RMDIR, &msg, rc); 
+        SMFS_POST_HOOK(dir, HOOK_RMDIR, &msg, rc); 
         
         post_smfs_inode(dir, cache_dir);
         post_smfs_inode(dentry->d_inode, cache_dentry->d_inode);
-
+        //like vfs_rmdir is doing with inode
+        if (!rc)
+                cache_dentry->d_inode->i_flags |= S_DEAD;
+        
         smfs_trans_commit(dir, handle, 0);
 
 exit:
@@ -479,21 +611,22 @@ static int smfs_mknod(struct inode *dir, struct dentry *dentry,
 {
         struct inode *cache_dir = I2CI(dir);
         struct inode *inode = NULL;
+        struct inode *parent = I2CI(dentry->d_parent->d_inode);
         struct dentry *cache_dentry = NULL;
         struct dentry *cache_parent = NULL;
         void *handle = NULL;
         int rc = 0;
         struct hook_msg msg = {
-                .dir = dir,
                 .dentry = dentry,
         };
  
         ENTRY;
         
-        if (!cache_dir || !cache_dir->i_op->mknod)
-                RETURN(-ENOENT);
+        LASSERT(parent);
+        LASSERT(cache_dir);
+        LASSERT(cache_dir->i_op->mknod);
 
-        cache_parent = pre_smfs_dentry(NULL, cache_dir, dentry->d_parent);
+        cache_parent = pre_smfs_dentry(NULL, parent, dentry->d_parent);
         cache_dentry = pre_smfs_dentry(cache_parent, NULL, dentry);
         if (!cache_parent || !cache_dentry) {
                 rc = -ENOMEM;
@@ -507,24 +640,25 @@ static int smfs_mknod(struct inode *dir, struct dentry *dentry,
         }
         
         pre_smfs_inode(dir, cache_dir);
-        pre_smfs_inode(dentry->d_inode, cache_dentry->d_inode);
-
-        SMFS_PRE_HOOK(dir->i_sb, HOOK_MKNOD, &msg); 
+        
+        SMFS_PRE_HOOK(dir, HOOK_MKNOD, &msg); 
         
         rc = cache_dir->i_op->mknod(cache_dir, cache_dentry, mode, rdev);
         if (!rc) {
                 inode = smfs_get_inode(dir->i_sb, cache_dentry->d_inode->i_ino,
                                        dir, 0);
-                if (inode)
+                if (inode) {
+                        //smsf_update_dentry(dentry, cache_dentry);
                         d_instantiate(dentry, inode);
+                }
                 else
                         rc = -ENOENT;
         }
 
-        SMFS_POST_HOOK(dir->i_sb, HOOK_MKNOD, &msg, rc); 
+        SMFS_POST_HOOK(dir, HOOK_MKNOD, &msg, rc); 
         
         post_smfs_inode(dir, cache_dir);
-        post_smfs_inode(dentry->d_inode, cache_dentry->d_inode);
+        
         smfs_trans_commit(dir, handle, 0);
 
 exit:
@@ -539,6 +673,8 @@ static int smfs_rename(struct inode *old_dir, struct dentry *old_dentry,
         struct inode *cache_old_dir = I2CI(old_dir);
         struct inode *cache_new_dir = I2CI(new_dir);
         struct inode *cache_old_inode = I2CI(old_dentry->d_inode);
+        struct inode *old_parent = I2CI(old_dentry->d_parent->d_inode);
+        struct inode *new_parent = I2CI(new_dentry->d_parent->d_inode);
         struct inode *cache_new_inode = NULL;
         struct dentry *cache_old_dentry = NULL;
         struct dentry *cache_new_dentry = NULL;
@@ -547,7 +683,6 @@ static int smfs_rename(struct inode *old_dir, struct dentry *old_dentry,
         void *handle = NULL;
         int    rc = 0;
         struct hook_rename_msg msg = {
-                .dir = old_dir,
                 .dentry = old_dentry,
                 .new_dir = new_dir,
                 .new_dentry = new_dentry
@@ -564,7 +699,7 @@ static int smfs_rename(struct inode *old_dir, struct dentry *old_dentry,
                         RETURN(-ENOENT);
         }
         
-        cache_old_parent = pre_smfs_dentry(NULL, cache_old_dir, old_dentry);
+        cache_old_parent = pre_smfs_dentry(NULL, old_parent, old_dentry->d_parent);
         cache_old_dentry = pre_smfs_dentry(cache_old_parent, cache_old_inode,
                                            old_dentry);
         if (!cache_old_parent || !cache_old_dentry) {
@@ -572,7 +707,7 @@ static int smfs_rename(struct inode *old_dir, struct dentry *old_dentry,
                 goto exit;
         }
         
-        cache_new_parent = pre_smfs_dentry(NULL, cache_new_dir, new_dentry);
+        cache_new_parent = pre_smfs_dentry(NULL, new_parent, new_dentry->d_parent);
         cache_new_dentry = pre_smfs_dentry(cache_new_parent, cache_new_inode,
                                            new_dentry);
         if (!cache_new_parent || !cache_new_dentry) {
@@ -591,12 +726,12 @@ static int smfs_rename(struct inode *old_dir, struct dentry *old_dentry,
         if (new_dentry->d_inode)
                 pre_smfs_inode(new_dentry->d_inode, cache_new_dentry->d_inode);
 
-        SMFS_PRE_HOOK(old_dir->i_sb, HOOK_RENAME, &msg); 
+        SMFS_PRE_HOOK(old_dir, HOOK_RENAME, &msg); 
         
         rc = cache_old_dir->i_op->rename(cache_old_dir, cache_old_dentry,
                                          cache_new_dir, cache_new_dentry);
         
-        SMFS_POST_HOOK(old_dir->i_sb, HOOK_RENAME, &msg, rc); 
+        SMFS_POST_HOOK(old_dir, HOOK_RENAME, &msg, rc); 
 
         post_smfs_inode(old_dir, cache_old_dir);
         post_smfs_inode(new_dir, cache_new_dir);
@@ -629,6 +764,10 @@ struct inode_operations smfs_dir_iops = {
         removexattr:    smfs_removexattr,       /* BKL held */
 };
 
+struct inode_operations smfs_iopen_iops = {
+        lookup:         smfs_iopen_lookup,
+};
+
 static ssize_t smfs_read_dir(struct file *filp, char *buf,
                              size_t size, loff_t *ppos)
 {
@@ -675,7 +814,6 @@ static int smfs_readdir(struct file *filp, void *dirent, filldir_t filldir)
         struct smfs_file_info *sfi = NULL;
         int    rc = 0;
         struct hook_readdir_msg msg = {
-                .dir = dentry->d_inode,
                 .dentry = dentry,
                 .filp = filp,
                 .dirent = dirent,
@@ -691,17 +829,13 @@ static int smfs_readdir(struct file *filp, void *dirent, filldir_t filldir)
         sfi = F2SMFI(filp);
         if (sfi->magic != SMFS_FILE_MAGIC) BUG();
 
-        SMFS_PRE_HOOK(dentry->d_inode->i_sb, HOOK_READDIR, &msg); 
+        SMFS_PRE_HOOK(dentry->d_inode, HOOK_READDIR, &msg); 
         
         rc = cache_inode->i_fop->readdir(sfi->c_file, dirent, filldir);
         
-        SMFS_POST_HOOK(dentry->d_inode->i_sb, HOOK_READDIR, &msg, rc);
+        SMFS_POST_HOOK(dentry->d_inode, HOOK_READDIR, &msg, rc);
         duplicate_file(filp, sfi->c_file);
 
-exit:
-        if (rc > 0)
-                rc = 0;
-
         RETURN(rc);
 }
 
@@ -713,3 +847,8 @@ struct file_operations smfs_dir_fops = {
         .open           = smfs_open,
         .release        = smfs_release,
 };
+
+struct file_operations smfs_iopen_fops = {
+        .read           = smfs_read_dir,
+};
+