#include <linux/lustre_smfs.h>
#include "smfs_internal.h"
+#define SMFS_IOPEN_INO 1
+
static void smfs_init_inode_info(struct inode *inode, void *opaque)
{
if (!I2SMI(inode)) {
struct inode *cache_inode = NULL;
- struct smfs_iget_args *sargs;
+ struct smfs_iget_args *sargs = opaque;
unsigned long ino;
- sargs = (struct smfs_iget_args *)opaque;
-
/* getting backing fs inode. */
+ LASSERT(sargs);
ino = sargs ? sargs->s_ino : inode->i_ino;
cache_inode = iget(S2CSB(inode->i_sb), ino);
-
+
OBD_ALLOC(inode->u.generic_ip,
sizeof(struct smfs_inode_info));
LASSERT(inode->u.generic_ip);
+
I2CI(inode) = cache_inode;
- CDEBUG(D_INODE, "cache_inode i_count ino %lu i_count %d\n",
+ CDEBUG(D_INODE, "cache_inode %lu i_count %d\n",
cache_inode->i_ino, atomic_read(&cache_inode->i_count));
post_smfs_inode(inode, cache_inode);
sm_set_inode_ops(cache_inode, inode);
-
+ //iopen stuff
+ if (ino == SMFS_IOPEN_INO) {
+ inode->i_op = &smfs_iopen_iops;
+ inode->i_fop = &smfs_iopen_fops;
+ }
if (sargs) {
struct inode *dir = sargs->s_inode;
if (dir)
I2SMI(inode)->smi_flags = I2SMI(dir)->smi_flags;
}
- }
+ } else
+ LBUG();
}
static void smfs_clear_inode_info(struct inode *inode)
if (I2SMI(inode)) {
struct inode *cache_inode = I2CI(inode);
+ CDEBUG(D_INODE, "Clear_info: inode %p\n",
+ cache_inode);
+
LASSERTF(((atomic_read(&cache_inode->i_count) == 1) ||
cache_inode == cache_inode->i_sb->s_root->d_inode),
- "inode %p cache inode %p %lu i_count %d != 0 \n",
+ "inode %p cache inode %p #%lu i_count %d != 1 \n",
inode, cache_inode, cache_inode->i_ino,
atomic_read(&cache_inode->i_count));
-
- if (cache_inode != cache_inode->i_sb->s_root->d_inode)
- iput(cache_inode);
- OBD_FREE(inode->u.generic_ip,
- sizeof(struct smfs_inode_info));
+ iput(cache_inode);
+
+ OBD_FREE(inode->u.generic_ip, sizeof(struct smfs_inode_info));
inode->u.generic_ip = NULL;
- }
+ } else
+ LBUG();
}
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))
static void smfs_read_inode2(struct inode *inode, void *opaque)
{
ENTRY;
EXIT;
}
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))
static int smfs_test_inode(struct inode *inode, unsigned long ino,
void *opaque)
#else
{
struct smfs_iget_args *sargs = (struct smfs_iget_args*)opaque;
- LASSERT(sargs);
-
- if (!sargs)
- return 1;
-
- if (inode->i_ino != sargs->s_ino)
+ if (!sargs || (inode->i_ino != sargs->s_ino))
return 0;
#ifdef CONFIG_SNAPFS
!smfs_snap_test_inode(inode, opaque))
return 0;
#endif
- if (I2SMI(inode)) {
- struct inode *cache_inode = I2CI(inode);
-
- /* this is needed to make symatry between smfs_put_inode(). */
- LASSERT(cache_inode != NULL);
- igrab(cache_inode);
-
- LASSERTF(cache_inode->i_ino == inode->i_ino,
- "inode ino %lu != cache ino %lu",
- cache_inode->i_ino, inode->i_ino);
- } else {
- smfs_init_inode_info(inode, opaque);
- }
return 1;
}
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0))
int smfs_set_inode(struct inode *inode, void *opaque)
{
- smfs_read_inode2(inode, opaque);
return 0;
}
-struct inode *smfs_iget(struct super_block *sb, ino_t hash,
+static struct inode *smfs_iget(struct super_block *sb, ino_t hash,
struct smfs_iget_args *sargs)
{
struct inode *inode;
inode = iget5_locked(sb, hash, smfs_test_inode,
smfs_set_inode, sargs);
if (inode) {
- if (inode->i_state & I_NEW)
+ if (inode->i_state & I_NEW) {
+ smfs_init_inode_info(inode, (void*)sargs);
unlock_new_inode(inode);
- CDEBUG(D_VFSTRACE, "inode: %lu/%u(%p) index %d "
- "ino %lu \n", inode->i_ino, inode->i_generation,
+ }
+ //inode->i_ino = hash;
+ CDEBUG(D_INODE, "inode: %lu/%u(%p) index %d "
+ "ino %d\n", inode->i_ino, inode->i_generation,
inode, sargs->s_index, sargs->s_ino);
inode->i_ino = hash;
}
inode = iget4(sb, hash, smfs_test_inode, sargs);
if (inode) {
struct inode *cache_inode = I2CI(inode);
- LASSERTF((inode->i_ino == cache_inode->i_ino),
- "inode %p ino %lu != cache inode %p ino %lu",
- inode, inode->i_ino, cache_inode, cache_inode->i_ino);
- CDEBUG(D_VFSTRACE, "inode: %lu/%u(%p)\n", inode->i_ino,
+
+ CDEBUG(D_INODE, "new inode: %lu/%u(%p)\n", inode->i_ino,
inode->i_generation, inode);
}
return inode;
sargs.s_ino = hash;
sargs.s_inode = dir;
sargs.s_index = index;
+
inode = smfs_iget(sb, hash, &sargs);
RETURN(inode);
}
-
-static void smfs_delete_inode(struct inode *inode)
-{
- ENTRY;
- clear_inode(inode);
- EXIT;
-}
-
+#ifdef FC3_KERNEL
+static int smfs_write_inode(struct inode *inode, int wait)
+#else
static void smfs_write_inode(struct inode *inode, int wait)
+#endif
{
- struct inode *cache_inode;
+ struct inode *cache_inode = I2CI(inode);
+#ifdef FC3_KERNEL
+ int rc = 0;
+#endif
ENTRY;
- cache_inode = I2CI(inode);
- LASSERT(cache_inode != NULL);
+ LASSERT(cache_inode);
+
+ CDEBUG(D_INODE,"Write inode %lu\n",inode->i_ino);
pre_smfs_inode(inode, cache_inode);
- if (S2CSB(inode->i_sb)->s_op->write_inode)
- S2CSB(inode->i_sb)->s_op->write_inode(cache_inode, wait);
+#ifdef FC3_KERNEL
+ rc = cache_inode->i_sb->s_op->write_inode(cache_inode, wait);
+#else
+ cache_inode->i_sb->s_op->write_inode(cache_inode, wait);
+#endif
post_smfs_inode(inode, cache_inode);
+
+#ifdef FC3_KERNEL
+ RETURN(rc);
+#else
EXIT;
+#endif
}
static void smfs_dirty_inode(struct inode *inode)
ENTRY;
cache_inode = I2CI(inode);
- if (!cache_inode || !S2CSB(inode->i_sb)) {
- EXIT;
- return;
- }
-
+ LASSERT(cache_inode);
+
pre_smfs_inode(inode, cache_inode);
- if (S2CSB(inode->i_sb)->s_op->dirty_inode)
- S2CSB(inode->i_sb)->s_op->dirty_inode(cache_inode);
+
+ S2CSB(inode->i_sb)->s_op->dirty_inode(cache_inode);
post_smfs_inode(inode, cache_inode);
EXIT;
}
-static void smfs_put_inode(struct inode *inode)
+static void smfs_delete_inode(struct inode *inode)
{
- struct inode *cache_inode;
ENTRY;
-
- cache_inode = I2CI(inode);
- LASSERT(cache_inode != NULL);
-
- if (atomic_read(&cache_inode->i_count) > 1)
- iput(cache_inode);
-
- /*
- * check if we have to release backend inode. As iput() calls fs
- * specific ->put_inode() first and than decrements inode rerfcount, we
- * should check here ->i_count for 1, not for 0.
-
- * In principle we could rely on ->clear_inode(), but it will be called
- * later, and thus we will have iputing of @inode and @cache_inode in
- * different control paths, this is why we do it here. --umka
- */
- if (atomic_read(&inode->i_count) == 1 &&
- cache_inode->i_sb->s_root->d_inode != cache_inode)
- smfs_clear_inode_info(inode);
-
+ clear_inode(inode);
EXIT;
}
{
ENTRY;
- if (!S2CSB(sb)) {
- EXIT;
- return;
- }
+ LASSERT(S2CSB(sb));
- if (S2CSB(sb)->s_op->write_super)
- S2CSB(sb)->s_op->write_super(S2CSB(sb));
+ S2CSB(sb)->s_op->write_super(S2CSB(sb));
duplicate_sb(sb, S2CSB(sb));
EXIT;
}
static void smfs_write_super_lockfs(struct super_block *sb)
{
- struct super_block *cache_sb;
+ struct super_block * cache_sb = S2CSB(sb);
ENTRY;
- cache_sb = S2CSB(sb);
- if (!cache_sb) {
- EXIT;
- return;
- }
-
- if (cache_sb->s_op->write_super_lockfs)
- cache_sb->s_op->write_super_lockfs(cache_sb);
+ LASSERT(cache_sb);
+ cache_sb->s_op->write_super_lockfs(cache_sb);
duplicate_sb(sb, cache_sb);
EXIT;
}
static void smfs_unlockfs(struct super_block *sb)
{
- struct super_block *cache_sb;
+ struct super_block * cache_sb = S2CSB(sb);
ENTRY;
- cache_sb = S2CSB(sb);
- if (!cache_sb) {
- EXIT;
- return;
- }
-
- if (cache_sb->s_op->unlockfs)
- cache_sb->s_op->unlockfs(cache_sb);
+ LASSERT(cache_sb);
+
+ cache_sb->s_op->unlockfs(cache_sb);
duplicate_sb(sb, cache_sb);
EXIT;
static int smfs_statfs(struct super_block *sb, struct kstatfs *buf)
#endif
{
- struct super_block *cache_sb;
+ struct super_block *cache_sb = S2CSB(sb);
int rc = 0;
ENTRY;
- cache_sb = S2CSB(sb);
- if (!cache_sb)
- RETURN(-EINVAL);
-
- if (cache_sb->s_op->statfs)
- rc = cache_sb->s_op->statfs(cache_sb, buf);
+ LASSERT(cache_sb);
+ rc = cache_sb->s_op->statfs(cache_sb, buf);
duplicate_sb(sb, cache_sb);
+
RETURN(rc);
}
+
static int smfs_remount(struct super_block *sb, int *flags, char *data)
{
- struct super_block *cache_sb;
+ struct super_block *cache_sb = S2CSB(sb);
int rc = 0;
ENTRY;
- cache_sb = S2CSB(sb);
-
- if (!cache_sb)
- RETURN(-EINVAL);
-
- if (cache_sb->s_op->remount_fs)
- rc = cache_sb->s_op->remount_fs(cache_sb, flags, data);
+ LASSERT(cache_sb);
+ rc = cache_sb->s_op->remount_fs(cache_sb, flags, data);
duplicate_sb(sb, cache_sb);
+
RETURN(rc);
}
.delete_inode = smfs_delete_inode,
.write_inode = smfs_write_inode,
.dirty_inode = smfs_dirty_inode, /* BKL not held. */
- .put_inode = smfs_put_inode, /* BKL not held. */
.write_super = smfs_write_super, /* BKL held */
.write_super_lockfs = smfs_write_super_lockfs, /* BKL not held. */
.unlockfs = smfs_unlockfs, /* BKL not held. */
.remount_fs = smfs_remount, /* BKL held */
};
-int is_smfs_sb(struct super_block *sb)
-{
- return (sb->s_op->put_super == smfs_super_ops.put_super);
-}
-EXPORT_SYMBOL(is_smfs_sb);
+
git://git.whamcloud.com / fs / lustre-release.git / blobdiff