Whamcloud - gitweb
landing b_cmobd_merge on HEAD
[fs/lustre-release.git] / lustre / smfs / file.c
index eaf1901..cb8d465 100644 (file)
@@ -1,5 +1,25 @@
-/*
- * file.c
+/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
+ * vim:expandtab:shiftwidth=8:tabstop=8:
+ *
+ *  lustre/smfs/inode.c
+ *  Lustre filesystem abstraction routines
+ *
+ *  Copyright (C) 2004 Cluster File Systems, Inc.
+ *
+ *   This file is part of Lustre, http://www.lustre.org.
+ *
+ *   Lustre is free software; you can redistribute it and/or
+ *   modify it under the terms of version 2 of the GNU General Public
+ *   License as published by the Free Software Foundation.
+ *
+ *   Lustre is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with Lustre; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
 #define DEBUG_SUBSYSTEM S_SM
 #include <linux/stat.h>
 #include <linux/unistd.h>
 #include <linux/pagemap.h>
+#include <linux/file.h>
+#include <linux/fs.h>
+#include <linux/obd_class.h>
+#include <linux/obd_support.h>
+#include <linux/lustre_lib.h>
 #include <linux/lustre_idl.h>
-#include "smfs_internal.h" 
-        
-/* instantiate a file handle to the cache file */
-void smfs_prepare_cachefile(struct inode *inode,
-                           struct file *file, 
-                           struct inode *cache_inode,
-                           struct file *cache_file,
-                           struct dentry *cache_dentry)
-{
-       ENTRY;
-       cache_file->f_pos = file->f_pos;
-        cache_file->f_mode = file->f_mode;
-        cache_file->f_flags = file->f_flags;
-        cache_file->f_count  = file->f_count;
-        cache_file->f_owner  = file->f_owner;
-       cache_file->f_error = file->f_error;
-       cache_file->f_op = inode->i_fop;
-       cache_file->f_dentry = cache_dentry;
-        cache_file->f_dentry->d_inode = cache_inode;
-       cache_file->f_vfsmnt = file->f_vfsmnt;
-       cache_file->private_data = file->private_data;
-       cache_file->f_it = file->f_it;
-       cache_file->f_reada = file->f_reada;
-       cache_file->f_ramax = file->f_ramax;
-       cache_file->f_raend = file->f_raend;
-       cache_file->f_ralen = file->f_ralen;
-       cache_file->f_rawin = file->f_rawin;
-       EXIT;
-}
-/* update file structs*/
-void smfs_update_file(struct file *file, 
-                     struct file *cache_file)
-{
-       ENTRY;
-       file->f_pos = cache_file->f_pos;
-        file->f_mode = cache_file->f_mode;
-        file->f_flags = cache_file->f_flags;
-        file->f_count  = cache_file->f_count;
-        file->f_owner  = cache_file->f_owner;
-       file->f_reada = cache_file->f_reada;
-       file->f_ramax = cache_file->f_ramax;
-       file->f_raend = cache_file->f_raend;
-       file->f_ralen = cache_file->f_ralen;
-       file->f_rawin = cache_file->f_rawin;
-       EXIT;
-}
+#include <linux/lustre_fsfilt.h>
+#include <linux/lustre_smfs.h>
 
-static ssize_t smfs_write (struct file *filp, const char *buf, 
-                          size_t count, loff_t *ppos)
+#include "smfs_internal.h"
+
+static ssize_t smfs_write(struct file *filp, const char *buf, size_t count,
+                          loff_t *ppos)
 {
-       struct  inode *cache_inode;
-       struct  dentry *dentry = filp->f_dentry;
-       struct  inode *inode = dentry->d_inode;
-        struct  file open_file;
-       struct  dentry open_dentry;
-       loff_t  tmp_ppos;
-       loff_t  *cache_ppos;
-       int     rc = 0;
-       
-       ENTRY;
-       
-       cache_inode = I2CI(inode);
+        struct inode *cache_inode;
+        struct smfs_file_info *sfi;
+        loff_t tmp_ppos;
+        loff_t *cache_ppos;
+        int rc = 0;
+        ENTRY;
+
+        cache_inode = I2CI(filp->f_dentry->d_inode);
+
         if (!cache_inode)
                 RETURN(-ENOENT);
-       
-       if (ppos != &(filp->f_pos)) {
-               cache_ppos = &tmp_ppos; 
-       } else {
-               cache_ppos = &open_file.f_pos; 
-       }
-       *cache_ppos = *ppos;
-       
-       smfs_prepare_cachefile(inode, filp, cache_inode, 
-                              &open_file, &open_dentry);
-       pre_smfs_inode(inode, cache_inode);
-       
-       if (cache_inode->i_fop->write)
-               rc = cache_inode->i_fop->write(&open_file, buf, count, cache_ppos);
-       
-       *ppos = *cache_ppos;
-       post_smfs_inode(inode, cache_inode);
-       smfs_update_file(filp, &open_file);
-
-       RETURN(rc);
+
+        sfi = F2SMFI(filp);
+
+        if (sfi->magic != SMFS_FILE_MAGIC) BUG();
+
+        if (ppos != &(filp->f_pos)) {
+                cache_ppos = &tmp_ppos;
+        } else {
+                cache_ppos = &sfi->c_file->f_pos;
+        }
+        *cache_ppos = *ppos;
+
+        pre_smfs_inode(filp->f_dentry->d_inode, cache_inode);
+
+        if (cache_inode->i_fop->write) {
+                rc = cache_inode->i_fop->write(sfi->c_file, buf,
+                                               count, cache_ppos);
+        }
+
+        SMFS_KML_POST(filp->f_dentry->d_inode, filp->f_dentry,
+                      ppos, &count, REINT_WRITE, "write", rc, exit);
+exit:
+        post_smfs_inode(filp->f_dentry->d_inode, cache_inode);
+        *ppos = *cache_ppos;
+        duplicate_file(filp, sfi->c_file);
+        RETURN(rc);
 }
 
-int smfs_ioctl(struct inode * inode, struct file * filp, 
-              unsigned int cmd, unsigned long arg)
+int smfs_ioctl(struct inode * inode, struct file * filp,
+               unsigned int cmd, unsigned long arg)
 {
-       struct  inode *cache_inode;
-       struct  dentry *dentry = filp->f_dentry;
-        struct  file open_file;
-       struct  dentry open_dentry;
-       ssize_t rc = 0;
-       
-       ENTRY;
-       
-       cache_inode = I2CI(dentry->d_inode);
+        struct        inode *cache_inode;
+        struct  smfs_file_info *sfi;
+        ssize_t rc = 0;
+
+        ENTRY;
+
+        cache_inode = I2CI(filp->f_dentry->d_inode);
         if (!cache_inode)
                 RETURN(-ENOENT);
 
-       smfs_prepare_cachefile(inode, filp, cache_inode, 
-                              &open_file, &open_dentry);
-       
-       if (cache_inode->i_fop->ioctl)
-               rc = cache_inode->i_fop->ioctl(cache_inode, &open_file, cmd, arg);
-               
-       post_smfs_inode(inode, cache_inode);
-       smfs_update_file(filp, &open_file);
+        sfi = F2SMFI(filp);
+        if (sfi->magic != SMFS_FILE_MAGIC) BUG();
+
+        pre_smfs_inode(inode, cache_inode);
+
+        if (cache_inode->i_fop->ioctl) {
+                rc = cache_inode->i_fop->ioctl(cache_inode,
+                                               sfi->c_file, cmd, arg);
+        }
+
+        post_smfs_inode(inode, cache_inode);
+        duplicate_file(filp, sfi->c_file);
+
         RETURN(rc);
 }
 
-static ssize_t smfs_read (struct file *filp, char *buf, 
-                         size_t count, loff_t *ppos)
+static ssize_t smfs_read(struct file *filp, char *buf,
+                         size_t count, loff_t *ppos)
 {
-       struct  inode *cache_inode;
-       struct  dentry *dentry = filp->f_dentry;
-       struct  inode *inode = dentry->d_inode;
-        struct  file open_file;
-       struct  dentry open_dentry;
-       loff_t  tmp_ppos;
-       loff_t  *cache_ppos;
-       ssize_t rc = 0;
-       
-       ENTRY;
-       
-       cache_inode = I2CI(dentry->d_inode);
+        struct        inode *cache_inode;
+        struct  smfs_file_info *sfi;
+        loff_t  tmp_ppos;
+        loff_t  *cache_ppos;
+        ssize_t rc = 0;
+
+        ENTRY;
+
+        cache_inode = I2CI(filp->f_dentry->d_inode);
         if (!cache_inode)
                 RETURN(-ENOENT);
 
-       if (ppos != &(filp->f_pos)) {
-               cache_ppos = &tmp_ppos; 
-       } else {
-               cache_ppos = &open_file.f_pos; 
-       }
-       *cache_ppos = *ppos;
-       
-       
-       smfs_prepare_cachefile(inode, filp, cache_inode, 
-                              &open_file, &open_dentry);
-
-       
-       pre_smfs_inode(inode, cache_inode);
-       if (cache_inode->i_fop->read)
-               rc = cache_inode->i_fop->read(&open_file, buf, count, cache_ppos);
-    
-       *ppos = *cache_ppos;
-       post_smfs_inode(inode, cache_inode);
-       smfs_update_file(filp, &open_file);
-       RETURN(rc);
+        sfi = F2SMFI(filp);
+        if (sfi->magic != SMFS_FILE_MAGIC) BUG();
+
+        if (ppos != &(filp->f_pos)) {
+                cache_ppos = &tmp_ppos;
+        } else {
+                cache_ppos = &sfi->c_file->f_pos;
+        }
+        *cache_ppos = *ppos;
+
+        pre_smfs_inode(filp->f_dentry->d_inode, cache_inode);
+
+        if (cache_inode->i_fop->read) {
+                rc = cache_inode->i_fop->read(sfi->c_file, buf,
+                                              count, cache_ppos);
+        }
+
+        *ppos = *cache_ppos;
+        post_smfs_inode(filp->f_dentry->d_inode, cache_inode);
+        duplicate_file(filp, sfi->c_file);
+
+        RETURN(rc);
 }
 
-static loff_t smfs_llseek(struct file *file, 
-                         loff_t offset, 
-                         int origin)
+static loff_t smfs_llseek(struct file *file,
+                          loff_t offset,
+                          int origin)
 {
-       struct  inode *cache_inode;
-       struct  dentry *dentry = file->f_dentry;
-        struct  file open_file;
-       struct  dentry open_dentry;
-       ssize_t rc = 0;
-       
-       ENTRY;
-       
-       cache_inode = I2CI(dentry->d_inode);
+        struct        inode *cache_inode;
+        struct  smfs_file_info *sfi;
+        ssize_t rc = 0;
+
+        ENTRY;
+
+        cache_inode = I2CI(file->f_dentry->d_inode);
         if (!cache_inode)
                 RETURN(-ENOENT);
 
-       smfs_prepare_cachefile(dentry->d_inode, file, cache_inode, 
-                              &open_file, &open_dentry);
-       
-       pre_smfs_inode(dentry->d_inode, cache_inode);
-       if (cache_inode->i_fop->llseek)
-               rc = cache_inode->i_fop->llseek(&open_file, offset, origin);
+        sfi = F2SMFI(file);
+        if (sfi->magic != SMFS_FILE_MAGIC) BUG();
+
+        pre_smfs_inode(file->f_dentry->d_inode, cache_inode);
+
+        if (cache_inode->i_fop->llseek) {
+                rc = cache_inode->i_fop->llseek(sfi->c_file,
+                                                offset, origin);
+        }
+
+        post_smfs_inode(file->f_dentry->d_inode, cache_inode);
+        duplicate_file(file, sfi->c_file);
 
-       post_smfs_inode(dentry->d_inode, cache_inode);
-       smfs_update_file(file, &open_file);
-               
         RETURN(rc);
 }
 
-static int smfs_mmap(struct file * file, struct vm_area_struct * vma)
+static int smfs_mmap(struct file *file, struct vm_area_struct *vma)
 {
         struct inode *inode = file->f_dentry->d_inode;
+        struct smfs_file_info *sfi;
         struct inode *cache_inode = NULL;
-        struct  file open_file;
-       struct  dentry open_dentry;
-       int    rc = 0;
+        int rc = 0;
+        ENTRY;
 
-       cache_inode = I2CI(inode);
+        cache_inode = I2CI(inode);
         if (!cache_inode)
                 RETURN(-ENOENT);
 
-       smfs_prepare_cachefile(inode, file, cache_inode, 
-                              &open_file, &open_dentry);
-  
-       if (cache_inode->i_mapping == &cache_inode->i_data)
+        sfi = F2SMFI(file);
+        if (sfi->magic != SMFS_FILE_MAGIC)
+                BUG();
+
+        if (cache_inode->i_mapping == &cache_inode->i_data)
                 inode->i_mapping = cache_inode->i_mapping;
 
-       pre_smfs_inode(inode, cache_inode);
-       if (cache_inode->i_fop->mmap)
-               rc = cache_inode->i_fop->mmap(&open_file, vma);
-      
-       post_smfs_inode(inode, cache_inode);
-       smfs_update_file(file, &open_file);
-       
-       RETURN(rc);
+        pre_smfs_inode(inode, cache_inode);
+        if (cache_inode->i_fop->mmap)
+                rc = cache_inode->i_fop->mmap(sfi->c_file, vma);
+
+        post_smfs_inode(inode, cache_inode);
+        duplicate_file(file, sfi->c_file);
+
+        RETURN(rc);
+}
+
+static int smfs_init_cache_file(struct inode *inode, struct file *filp)
+{
+        struct smfs_file_info *sfi = NULL;
+        struct file *cache_filp = NULL;
+        struct dentry *cache_dentry = NULL;
+        int rc = 0;
+        ENTRY;
+
+        OBD_ALLOC(sfi, sizeof(struct smfs_file_info));
+        if (!sfi)
+                RETURN(-ENOMEM);
+
+        cache_filp = get_empty_filp();
+        if (!cache_filp)
+                GOTO(err_exit, rc = -ENOMEM);
+
+        sfi->magic = SMFS_FILE_MAGIC;
+
+        cache_dentry = pre_smfs_dentry(NULL, I2CI(inode), filp->f_dentry);
+        if (!cache_dentry)
+                GOTO(err_exit, rc = -ENOMEM);
+
+        cache_filp->f_vfsmnt = filp->f_vfsmnt;
+
+        cache_filp->f_dentry = cache_dentry;
+        duplicate_file(cache_filp, filp);
+
+        sfi->c_file = cache_filp;
+
+        if (filp->private_data != NULL)
+                BUG();
+
+        filp->private_data = sfi;
+
+        RETURN(rc);
+err_exit:
+        if (sfi)
+                OBD_FREE(sfi, sizeof(struct smfs_file_info));
+        if (cache_filp)
+                put_filp(cache_filp);
+        RETURN(rc);
+}
+
+static int smfs_cleanup_cache_file(struct file *filp)
+{
+        struct smfs_file_info *sfi = NULL;
+        int rc = 0;
+        ENTRY;
+
+        sfi = F2SMFI(filp);
+
+        post_smfs_dentry(sfi->c_file->f_dentry);
+
+        put_filp(sfi->c_file);
+
+        OBD_FREE(sfi, sizeof(struct smfs_file_info));
+
+        filp->private_data = NULL;
+
+        RETURN(rc);
 }
 
-static int smfs_open(struct inode * inode, struct file * filp)
+int smfs_open(struct inode *inode, struct file *filp)
 {
-       struct inode *cache_inode = NULL;
-        struct  file open_file;
-       struct  dentry open_dentry;
-       int    rc = 0;
+        struct inode *cache_inode = NULL;
+        int rc = 0;
+        ENTRY;
 
-       cache_inode = I2CI(inode);
+        cache_inode = I2CI(inode);
         if (!cache_inode)
                 RETURN(-ENOENT);
 
-       smfs_prepare_cachefile(inode, filp, cache_inode, 
-                              &open_file, &open_dentry);
-       
-       pre_smfs_inode(inode, cache_inode);
-       if (cache_inode->i_fop->open)
-               rc = cache_inode->i_fop->open(cache_inode, &open_file);
-        
-       post_smfs_inode(inode, cache_inode);
-       smfs_update_file(filp, &open_file);
-       
-       RETURN(rc);
+        if ((rc = smfs_init_cache_file(inode, filp)))
+                RETURN(rc);
+
+        pre_smfs_inode(inode, cache_inode);
+        if (cache_inode->i_fop->open)
+                rc = cache_inode->i_fop->open(cache_inode, F2CF(filp));
 
+        post_smfs_inode(inode, cache_inode);
+        duplicate_file(filp, F2CF(filp));
+        RETURN(rc);
 }
-static int smfs_release(struct inode * inode, struct file * filp)
+
+int smfs_release(struct inode *inode, struct file *filp)
 {
-       struct inode *cache_inode = NULL;
-        struct  file open_file;
-       struct  dentry open_dentry;
-       int    rc = 0;
+        struct inode *cache_inode = NULL;
+        struct smfs_file_info *sfi = NULL;
+        int rc = 0;
+        ENTRY;
 
-       cache_inode = I2CI(inode);
+        cache_inode = I2CI(inode);
         if (!cache_inode)
                 RETURN(-ENOENT);
-       
-       smfs_prepare_cachefile(inode, filp, cache_inode, 
-                              &open_file, &open_dentry);
-
-       pre_smfs_inode(inode, cache_inode);
-       if (cache_inode->i_fop->release)
-               rc = cache_inode->i_fop->release(cache_inode, &open_file);
-
-       post_smfs_inode(inode, cache_inode);
-       smfs_update_file(filp, &open_file);
-        
-       RETURN(rc);
+
+        sfi = F2SMFI(filp);
+        if (sfi->magic != SMFS_FILE_MAGIC)
+                BUG();
+
+        pre_smfs_inode(inode, cache_inode);
+        if (cache_inode->i_fop->release)
+                rc = cache_inode->i_fop->release(cache_inode, sfi->c_file);
+
+        post_smfs_inode(inode, cache_inode);
+        duplicate_file(filp, sfi->c_file);
+
+        smfs_cleanup_cache_file(filp);
+        RETURN(rc);
 }
-int smfs_fsync(struct file * file, 
-                     struct dentry *dentry, 
-                     int datasync)
+
+int smfs_fsync(struct file *file, struct dentry *dentry, int datasync)
 {
-       struct inode *inode = dentry->d_inode;
-       struct inode *cache_inode;
-        struct  file open_file;
-       struct  dentry open_dentry;
-       int    rc = 0;
+        struct smfs_file_info *sfi = NULL;
+        struct inode *cache_inode;
+        int rc = 0;
 
-       cache_inode = I2CI(inode);
+        cache_inode = I2CI(file->f_dentry->d_inode);
         if (!cache_inode)
                 RETURN(-ENOENT);
-       
-       smfs_prepare_cachefile(inode, file, cache_inode, 
-                              &open_file, &open_dentry);
-
-       pre_smfs_inode(inode, cache_inode);
-       if (cache_inode->i_fop->fsync)
-               rc = cache_inode->i_fop->fsync(&open_file, &open_dentry, datasync);
-       
-       post_smfs_inode(inode, cache_inode);
-       smfs_update_file(file, &open_file);
-       
-       RETURN(rc);
+
+        sfi = F2SMFI(file);
+        if (sfi->magic != SMFS_FILE_MAGIC)
+                BUG();
+
+        pre_smfs_inode(file->f_dentry->d_inode, cache_inode);
+
+        if (cache_inode->i_fop->fsync)
+                rc = cache_inode->i_fop->fsync(sfi->c_file,
+                                               sfi->c_file->f_dentry, datasync);
+
+        post_smfs_inode(file->f_dentry->d_inode, cache_inode);
+        duplicate_file(file, sfi->c_file);
+
+        RETURN(rc);
 }
 
 struct file_operations smfs_file_fops = {
-       llseek:         smfs_llseek,
-       read:           smfs_read,
-       write:          smfs_write,
-       ioctl:          smfs_ioctl,
-       mmap:           smfs_mmap,
-       open:           smfs_open,
-       release:        smfs_release,
-       fsync:          smfs_fsync,
+        llseek:         smfs_llseek,
+        read:           smfs_read,
+        write:          smfs_write,
+        ioctl:          smfs_ioctl,
+        mmap:           smfs_mmap,
+        open:           smfs_open,
+        release:        smfs_release,
+        fsync:          smfs_fsync,
 };
 
-static void smfs_prepare_cache_dentry(struct dentry *dentry, struct inode *inode)
+static void smfs_truncate(struct inode *inode)
 {
-       atomic_set(&dentry->d_count, 1);
-       dentry->d_vfs_flags = 0;
-       dentry->d_flags = 0;
-       dentry->d_inode = inode;
-       dentry->d_op = NULL;
-       dentry->d_fsdata = NULL;
-       dentry->d_mounted = 0;
-       INIT_LIST_HEAD(&dentry->d_hash);
-       INIT_LIST_HEAD(&dentry->d_lru);
-       INIT_LIST_HEAD(&dentry->d_subdirs);
-       INIT_LIST_HEAD(&dentry->d_alias);
+        struct inode *cache_inode;
+
+        cache_inode = I2CI(inode);
+
+        if (!cache_inode)
+                return;
+
+        if (!cache_inode)
+                return;
+
+        pre_smfs_inode(inode, cache_inode);
+        if (cache_inode->i_op->truncate)
+                cache_inode->i_op->truncate(cache_inode);
+
+        post_smfs_inode(inode, cache_inode);
+
+        return;
 }
 
-static void smfs_truncate(struct inode * inode)      
-{
-       struct  inode *cache_inode;
-
-       cache_inode = I2CI(inode);
-
-       if (!cache_inode)
-               return;
-       
-       if (cache_inode->i_op->truncate)
-               cache_inode->i_op->truncate(cache_inode);
-
-       post_smfs_inode(inode, cache_inode);
-        
-       return; 
-} 
-int smfs_setattr(struct dentry *dentry, struct iattr *attr)      
+int smfs_setattr(struct dentry *dentry, struct iattr *attr)
 {
-       struct  inode *cache_inode;
-       struct  dentry open_dentry;
-
-       int     rc = 0;
-
-       cache_inode = I2CI(dentry->d_inode);
-
-       if (!cache_inode) 
-               RETURN(-ENOENT);
-       smfs_prepare_cache_dentry(&open_dentry, cache_inode);
-       
-       pre_smfs_inode(dentry->d_inode, cache_inode);
-       if (cache_inode->i_op->setattr)
-               rc = cache_inode->i_op->setattr(&open_dentry, attr);
-
-       post_smfs_inode(dentry->d_inode, cache_inode);
-       
-       RETURN(rc);
-} 
-  
-int smfs_setxattr(struct dentry *dentry, const char *name,
-                 const void *value, size_t size, int flags)
+        struct inode *cache_inode;
+        struct dentry *cache_dentry;
+        void  *handle = NULL;
+        int rc = 0;
+
+        cache_inode = I2CI(dentry->d_inode);
+        if (!cache_inode)
+                RETURN(-ENOENT);
+
+        cache_dentry = pre_smfs_dentry(NULL, cache_inode, dentry);
+        if (!cache_dentry)
+                RETURN(-ENOMEM);
+
+        handle = smfs_trans_start(dentry->d_inode, FSFILT_OP_SETATTR, NULL);
+        if (IS_ERR(handle) ) {
+                CERROR("smfs_do_mkdir: no space for transaction\n");
+                RETURN(-ENOSPC);
+        }
+
+        pre_smfs_inode(dentry->d_inode, cache_inode);
+
+        if (cache_inode->i_op->setattr)
+                rc = cache_inode->i_op->setattr(cache_dentry, attr);
+
+        SMFS_KML_POST(dentry->d_inode, dentry, attr, NULL,
+                      REINT_SETATTR, "setattr", rc, exit);
+exit:
+        post_smfs_inode(dentry->d_inode, cache_inode);
+        post_smfs_dentry(cache_dentry);
+        smfs_trans_commit(dentry->d_inode, handle, 0);
+        RETURN(rc);
+}
+
+int smfs_setxattr(struct dentry *dentry, const char *name, const void *value,
+                  size_t size, int flags)
 {
-       struct  inode *cache_inode;
-       struct  dentry open_dentry;
-       int     rc = 0;
-
-       cache_inode = I2CI(dentry->d_inode);
-
-       if (!cache_inode) 
-               RETURN(-ENOENT);
-
-       pre_smfs_inode(dentry->d_inode, cache_inode);
-       smfs_prepare_cache_dentry(&open_dentry, cache_inode);
-       
-       if (cache_inode->i_op->setattr)
-               rc = cache_inode->i_op->setxattr(&open_dentry, name, value, size, flags);
-
-       post_smfs_inode(dentry->d_inode, cache_inode);
-       RETURN(rc);
-} 
-                        
-int smfs_getxattr(struct dentry *dentry, const char *name,
-                 void *buffer, size_t size)
+        struct inode *cache_inode;
+        struct dentry *cache_dentry;
+        int rc = 0;
+
+        cache_inode = I2CI(dentry->d_inode);
+        if (!cache_inode)
+                RETURN(-ENOENT);
+
+        cache_dentry = pre_smfs_dentry(NULL, cache_inode, dentry);
+        if (!cache_dentry)
+                RETURN(-ENOMEM);
+
+        pre_smfs_inode(dentry->d_inode, cache_inode);
+
+        if (cache_inode->i_op->setxattr)
+                rc = cache_inode->i_op->setxattr(cache_dentry, name, value,
+                                                 size, flags);
+
+        post_smfs_inode(dentry->d_inode, cache_inode);
+        post_smfs_dentry(cache_dentry);
+
+        RETURN(rc);
+}
+
+int smfs_getxattr(struct dentry *dentry, const char *name, void *buffer,
+                  size_t size)
 {
-       struct  inode *cache_inode;
-       struct  dentry open_dentry;
-       int     rc = 0;
+        struct inode *cache_inode;
+        struct dentry *cache_dentry;
+        int rc = 0;
 
-       cache_inode = I2CI(dentry->d_inode);
+        cache_inode = I2CI(dentry->d_inode);
+        if (!cache_inode)
+                RETURN(-ENOENT);
 
-       if (!cache_inode) 
-               RETURN(-ENOENT);
+        cache_dentry = pre_smfs_dentry(NULL, cache_inode, dentry);
+        if (!cache_dentry)
+                RETURN(-ENOMEM);
 
-       smfs_prepare_cache_dentry(&open_dentry, cache_inode);
-       pre_smfs_inode(dentry->d_inode, cache_inode);
-       
-       if (cache_inode->i_op->setattr)
-               rc = cache_inode->i_op->getxattr(&open_dentry, name, buffer, size);
+        pre_smfs_inode(dentry->d_inode, cache_inode);
 
-       post_smfs_inode(dentry->d_inode, cache_inode);
-       RETURN(rc);
+        if (cache_inode->i_op->getattr)
+                rc = cache_inode->i_op->getxattr(cache_dentry, name, buffer,
+                                                 size);
+
+        post_smfs_inode(dentry->d_inode, cache_inode);
+        post_smfs_dentry(cache_dentry);
+
+        RETURN(rc);
 }
 
 ssize_t smfs_listxattr(struct dentry *dentry, char *buffer, size_t size)
 {
-       struct  inode *cache_inode;
-       struct  dentry open_dentry;
-       int     rc = 0;
+        struct inode *cache_inode;
+        struct dentry *cache_dentry;
+        int rc = 0;
+
+        cache_inode = I2CI(dentry->d_inode);
+        if (!cache_inode)
+                RETURN(-ENOENT);
 
-       cache_inode = I2CI(dentry->d_inode);
+        cache_dentry = pre_smfs_dentry(NULL, cache_inode, dentry);
+        if (!cache_dentry)
+                RETURN(-ENOMEM);
 
-       if (!cache_inode) 
-               RETURN(-ENOENT);
+        pre_smfs_inode(dentry->d_inode, cache_inode);
 
-       smfs_prepare_cache_dentry(&open_dentry, cache_inode);
-       pre_smfs_inode(dentry->d_inode, cache_inode);
-       
-       if (cache_inode->i_op->listxattr)
-               rc = cache_inode->i_op->listxattr(&open_dentry, buffer, size);
+        if (cache_inode->i_op->listxattr)
+                rc = cache_inode->i_op->listxattr(cache_dentry, buffer, size);
 
-       post_smfs_inode(dentry->d_inode, cache_inode);
-       RETURN(rc);
-}                                                                                                                                                           
+        post_smfs_inode(dentry->d_inode, cache_inode);
+        post_smfs_dentry(cache_dentry);
+
+        RETURN(rc);
+}
 
 int smfs_removexattr(struct dentry *dentry, const char *name)
 {
-       struct  inode *cache_inode;
-       struct  dentry open_dentry;
-       int     rc = 0;
+        struct inode *cache_inode;
+        struct dentry *cache_dentry;
+        int rc = 0;
+
+        cache_inode = I2CI(dentry->d_inode);
+        if (!cache_inode)
+                RETURN(-ENOENT);
 
-       cache_inode = I2CI(dentry->d_inode);
+        cache_dentry = pre_smfs_dentry(NULL, cache_inode, dentry);
+        if (!cache_dentry)
+                RETURN(-ENOMEM);
 
-       if (!cache_inode) 
-               RETURN(-ENOENT);
+        pre_smfs_inode(dentry->d_inode, cache_inode);
 
-       smfs_prepare_cache_dentry(&open_dentry, cache_inode);
-       pre_smfs_inode(dentry->d_inode, cache_inode);
-       
-       if (cache_inode->i_op->removexattr)
-               rc = cache_inode->i_op->removexattr(&open_dentry, name);
+        if (cache_inode->i_op->removexattr)
+                rc = cache_inode->i_op->removexattr(cache_dentry, name);
 
-       post_smfs_inode(dentry->d_inode, cache_inode);
-       RETURN(rc);
+        post_smfs_inode(dentry->d_inode, cache_inode);
+        post_smfs_dentry(cache_dentry);
+
+        RETURN(rc);
 }
 
 struct inode_operations smfs_file_iops = {
-       truncate:       smfs_truncate,          /* BKL held */
+        truncate:       smfs_truncate,          /* BKL held */
         setattr:        smfs_setattr,           /* BKL held */
         setxattr:       smfs_setxattr,          /* BKL held */
         getxattr:       smfs_getxattr,          /* BKL held */
         listxattr:      smfs_listxattr,         /* BKL held */
         removexattr:    smfs_removexattr,       /* BKL held */
 };
-