#include <linux/lustre_lib.h>
#include <linux/lustre_idl.h>
#include <linux/lustre_fsfilt.h>
-#include <linux/lustre_snap.h>
#include <linux/lustre_smfs.h>
+#include <linux/lustre_snap.h>
#include "smfs_internal.h"
RETURN(-ENOSPC);
lock_kernel();
- SMFS_HOOK(dir, dentry, NULL, NULL, HOOK_CREATE, handle, PRE_HOOK, rc,
- exit);
+ SMFS_HOOK(dir, dentry, NULL, NULL, HOOK_CREATE, handle,
+ PRE_HOOK, rc, exit);
+
cache_parent = pre_smfs_dentry(NULL, cache_dir, dentry);
cache_dentry = pre_smfs_dentry(cache_parent, NULL, dentry);
GOTO(exit, rc = -ENOMEM);
pre_smfs_inode(dir, cache_dir);
+
#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))
if (cache_dir && cache_dir->i_op->create)
rc = cache_dir->i_op->create(cache_dir, cache_dentry,
#endif
if (rc)
GOTO(exit, rc);
-
- inode = iget4(dir->i_sb, cache_dentry->d_inode->i_ino, NULL,
- &I2SMI(dir)->smi_flags);
- if (!inode)
- GOTO(exit, rc = -ENOMEM);
+
+ SMFS_GET_INODE(dir->i_sb, cache_dentry->d_inode, dir, inode,
+ rc, exit);
d_instantiate(dentry, inode);
- sm_set_inode_ops(cache_dentry->d_inode, inode);
post_smfs_inode(dir, cache_dir);
- SMFS_HOOK(dir, dentry, NULL, NULL, HOOK_CREATE, handle, POST_HOOK, rc,
- exit);
+
+ SMFS_HOOK(dir, dentry, NULL, NULL, HOOK_CREATE, handle,
+ POST_HOOK, rc, exit);
exit:
unlock_kernel();
post_smfs_dentry(cache_dentry);
if (!(cache_dir = I2CI(dir)))
RETURN(ERR_PTR(-ENOENT));
- SMFS_HOOK(dir, dentry, NULL, NULL, HOOK_LOOKUP, handle, PRE_HOOK, rc2,
- exit);
- if (rc2)
- RETURN(ERR_PTR(rc2));
-
/* preparing artificial backing fs dentries. */
cache_parent = pre_smfs_dentry(NULL, cache_dir, dentry->d_parent);
cache_dentry = pre_smfs_dentry(cache_parent, NULL, dentry);
if (!cache_dir && cache_dir->i_op->lookup)
GOTO(exit, rc = ERR_PTR(-ENOENT));
+ SMFS_HOOK(dir, dentry, NULL, NULL, HOOK_LOOKUP, handle,
+ PRE_HOOK, rc2, exit);
+
/* perform lookup in backing fs. */
#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))
rc = cache_dir->i_op->lookup(cache_dir, cache_dentry);
#else
rc = cache_dir->i_op->lookup(cache_dir, cache_dentry, nd);
#endif
-
if (rc && IS_ERR(rc))
GOTO(exit, rc);
dentry->d_inode = cache_inode;
GOTO(exit, rc = NULL);
}
- inode = iget4(dir->i_sb, cache_inode->i_ino, NULL,
- &I2SMI(dir)->smi_flags);
- } else {
- d_add(dentry, NULL);
- GOTO(exit, rc);
+ SMFS_GET_INODE(dir->i_sb, cache_inode, dir, inode, rc2, exit);
}
d_add(dentry, inode);
SMFS_HOOK(dir, dentry, NULL, NULL, HOOK_LOOKUP, handle, POST_HOOK, rc2,
exit);
exit:
- if (rc2)
+ if (rc2 < 0)
rc = ERR_PTR(rc2);
post_smfs_dentry(cache_dentry);
post_smfs_dentry(cache_parent);
RETURN(rc);
}
-static int smfs_link(struct dentry * old_dentry,
- struct inode * dir, struct dentry *dentry)
+static int smfs_link(struct dentry *old_dentry,
+ struct inode *dir, struct dentry *dentry)
{
- struct inode *cache_old_inode = NULL;
- struct inode *cache_dir = I2CI(dir);
- struct inode *inode = NULL;
- struct dentry *cache_dentry = NULL;
- struct dentry *cache_old_dentry = NULL;
- struct dentry *cache_parent = NULL;
- void *handle = NULL;
- int rc = 0;
+ struct inode *cache_old_inode = NULL;
+ struct inode *cache_dir = I2CI(dir);
+ struct inode *inode = NULL;
+ struct dentry *cache_dentry = NULL;
+ struct dentry *cache_old_dentry = NULL;
+ struct dentry *cache_parent = NULL;
+ void *handle = NULL;
+ int rc = 0;
inode = old_dentry->d_inode;
-
cache_old_inode = I2CI(inode);
handle = smfs_trans_start(dir, FSFILT_OP_LINK, NULL);
RETURN(-ENOSPC);
lock_kernel();
- SMFS_HOOK(dir, old_dentry, NULL, NULL, HOOK_LINK, handle, PRE_HOOK, rc,
- exit);
+ SMFS_HOOK(dir, old_dentry, NULL, NULL, HOOK_LINK, handle,
+ PRE_HOOK, rc, exit);
cache_parent = pre_smfs_dentry(NULL, cache_dir, dentry);
cache_dentry = pre_smfs_dentry(cache_parent, NULL, dentry);
d_instantiate(dentry, inode);
post_smfs_inode(dir, cache_dir);
- SMFS_HOOK(dir, old_dentry, dentry, NULL, HOOK_LINK, handle, POST_HOOK,
- rc, exit);
-
+ SMFS_HOOK(dir, old_dentry, dentry, NULL, HOOK_LINK, handle,
+ POST_HOOK, rc, exit);
exit:
unlock_kernel();
post_smfs_dentry(cache_dentry);
if (cache_dir->i_op->symlink)
rc = cache_dir->i_op->symlink(cache_dir, cache_dentry, symname);
- inode = iget4(dir->i_sb, cache_dentry->d_inode->i_ino, NULL,
- &I2SMI(dir)->smi_flags);
post_smfs_inode(dir, cache_dir);
+
+ SMFS_GET_INODE(dir->i_sb, cache_dentry->d_inode, dir, inode, rc, exit);
if (inode)
d_instantiate(dentry, inode);
else
if (rc)
GOTO(exit, rc);
-
- inode = iget4(dir->i_sb, cache_dentry->d_inode->i_ino, NULL,
- &I2SMI(dir)->smi_flags);
- if (!inode)
- GOTO(exit, rc = -ENOENT);
-
+
+ SMFS_GET_INODE(dir->i_sb, cache_dentry->d_inode, dir, inode, rc, exit);
d_instantiate(dentry, inode);
post_smfs_inode(dir, cache_dir);
mode, rdev)))
GOTO(exit, rc);
- inode = iget4(dir->i_sb, cache_dentry->d_inode->i_ino, NULL,
- &I2SMI(dir)->smi_flags);
+ SMFS_GET_INODE(dir->i_sb, cache_dentry->d_inode, dir, inode, rc, exit);
+
d_instantiate(dentry, inode);
pre_smfs_inode(dir, cache_dir);
RETURN(rc);
}
-static int smfs_rename(struct inode * old_dir, struct dentry *old_dentry,
- struct inode * new_dir,struct dentry *new_dentry)
+static int smfs_rename(struct inode *old_dir, struct dentry *old_dentry,
+ struct inode *new_dir,struct dentry *new_dentry)
{
struct inode *cache_old_dir = I2CI(old_dir);
struct inode *cache_new_dir = I2CI(new_dir);
lock_kernel();
- SMFS_HOOK(old_dir, old_dentry, new_dir, new_dentry, HOOK_RENAME, handle,
- PRE_HOOK, rc, exit);
+ SMFS_HOOK(old_dir, old_dentry, new_dir, new_dentry, HOOK_RENAME,
+ handle, PRE_HOOK, rc, exit);
cache_old_parent = pre_smfs_dentry(NULL, cache_old_dir, old_dentry);
+
cache_old_dentry = pre_smfs_dentry(cache_old_parent, cache_old_inode,
old_dentry);
+
if (!cache_old_parent || !cache_old_dentry)
GOTO(exit, rc = -ENOMEM);
cache_new_parent = pre_smfs_dentry(NULL, cache_new_dir, new_dentry);
+
cache_new_dentry = pre_smfs_dentry(cache_new_parent, cache_new_inode,
new_dentry);
+
if (!cache_new_parent || !cache_new_dentry)
GOTO(exit, rc = -ENOMEM);
if (cache_inode->i_fop->read)
rc = cache_inode->i_fop->read(sfi->c_file, buf, size,
cache_ppos);
-
*ppos = *cache_ppos;
duplicate_file(filp, sfi->c_file);
RETURN(rc);
sfi = F2SMFI(filp);
if (sfi->magic != SMFS_FILE_MAGIC) BUG();
+ SMFS_HOOK(dentry->d_inode, filp, dirent, filldir, HOOK_READDIR, NULL,
+ PRE_HOOK, rc, exit);
+
if (cache_inode->i_fop->readdir)
rc = cache_inode->i_fop->readdir(sfi->c_file, dirent, filldir);
+ SMFS_HOOK(dentry->d_inode, filp, dirent, filldir, HOOK_READDIR, NULL,
+ POST_HOOK, rc, exit);
+
duplicate_file(filp, sfi->c_file);
+exit:
+ if (rc > 0)
+ rc = 0;
RETURN(rc);
}
struct file_operations smfs_dir_fops = {
- read: smfs_read_dir,
- readdir: smfs_readdir, /* BKL held */
- ioctl: smfs_ioctl, /* BKL held */
- fsync: smfs_fsync, /* BKL held */
- open: smfs_open,
- release: smfs_release,
+ .read = smfs_read_dir,
+ .readdir = smfs_readdir, /* BKL held */
+ .ioctl = smfs_ioctl, /* BKL held */
+ .fsync = smfs_fsync, /* BKL held */
+ .open = smfs_open,
+ .release = smfs_release,
};