X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Finclude%2Flinux%2Flustre_smfs.h;h=e6d907c21abb80e1a07730c820dc332a0fcfd0f7;hp=474095c039845448a099d97f2540c22572a69fd6;hb=0ae1c575448dbb0700bc45a88f964645c37a774c;hpb=04146ac71a9f9597b1be366465c210fcb18ff73d diff --git a/lustre/include/linux/lustre_smfs.h b/lustre/include/linux/lustre_smfs.h index 474095c..e6d907c 100644 --- a/lustre/include/linux/lustre_smfs.h +++ b/lustre/include/linux/lustre_smfs.h @@ -33,53 +33,53 @@ struct snap_inode_info { ino_t sn_root_ino; /*the root ino of this snap*/ }; struct smfs_inode_info { + /* this first part of struct should be the same as in mds_info_info */ + //struct lustre_id smi_id; + + /* smfs part. */ struct inode *smi_inode; __u32 smi_flags; struct snap_inode_info sm_sninfo; }; - +#if 0 struct journal_operations { void *(*tr_start)(struct inode *, int op); void (*tr_commit)(void *handle); }; - +#endif struct sm_operations { /* operations on the file store */ struct super_operations sm_sb_ops; struct inode_operations sm_dir_iops; struct inode_operations sm_file_iops; struct inode_operations sm_sym_iops; + struct inode_operations sm_special_iops; struct file_operations sm_dir_fops; struct file_operations sm_file_fops; struct file_operations sm_sym_fops; - struct dentry_operations sm_dentry_ops; - struct journal_operations sm_journal_ops; + //struct dentry_operations sm_dentry_ops; + //struct journal_operations sm_journal_ops; }; /*smfs rec*/ -typedef int (*smfs_pack_rec_func)(char *buffer, struct dentry *dentry, +/*typedef int (*smfs_pack_rec_func)(char *buffer, struct dentry *dentry, struct inode *dir, void *data1, void *data2, int op); + typedef enum { PACK_NORMAL = 0, PACK_OST = 1, PACK_MDS = 2, PACK_MAX = 3, } pack_func_t; +*/ struct mds_kml_pack_info { int mpi_bufcount; int mpi_size[4]; int mpi_total_size; }; -typedef int (*smfs_hook_func)(struct inode *inode, void *dentry, - void *data1, void *data2, int op, void *handle); -struct smfs_hook_ops { - struct list_head smh_list; - char * smh_name; - smfs_hook_func smh_post_op; - smfs_hook_func smh_pre_op; -}; + struct smfs_super_info { struct super_block *smsi_sb; struct vfsmount *smsi_mnt; /* mount the cache kern */ @@ -87,19 +87,20 @@ struct smfs_super_info { struct fsfilt_operations *sm_fsfilt; /* fsfilt operations */ struct sm_operations *sm_ops; /* cache ops */ struct lvfs_run_ctxt *smsi_ctxt; - struct llog_ctxt *smsi_rec_log; /* smfs kml llog */ + struct llog_ctxt *smsi_kml_log; /* smfs kml llog */ struct dentry *smsi_logs_dir; struct dentry *smsi_objects_dir; - struct dentry *smsi_delete_dir; /* for delete inode dir */ char *smsi_cache_ftype; /* cache file system type */ char *smsi_ftype; /* file system type */ struct obd_export *smsi_exp; /* file system obd exp */ struct snap_super_info *smsi_snap_info; /* snap table cow */ - smfs_pack_rec_func smsi_pack_rec[PACK_MAX]; /* sm_pack_rec type ops */ - __u32 smsi_flags; /* flags */ + //smfs_pack_rec_func smsi_pack_rec[PACK_MAX]; /* sm_pack_rec type ops */ + struct rw_semaphore plg_sem; /*rw semaphore to protect plg operations */ + __u32 plg_flags; /* flags */ + __u32 smsi_flags; __u32 smsi_ops_check; - struct list_head smsi_hook_list; - kmem_cache_t * smsi_inode_cachep; /*inode_cachep*/ + struct list_head smsi_plg_list; + //kmem_cache_t * smsi_inode_cachep; /*inode_cachep*/ }; @@ -124,11 +125,14 @@ struct fs_extent{ }; #define I2SMI(inode) ((struct smfs_inode_info *) ((inode->u.generic_ip))) +//#define I2FSI(inode) (((inode->u.generic_ip))) #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)) +#define S2FSI(sb) (((sb->u.generic_sbp))) #define S2SMI(sb) ((struct smfs_super_info *) ((sb->u.generic_sbp))) #define S2CSB(sb) (((struct smfs_super_info *)((sb->u.generic_sbp)))->smsi_sb) #else +#define S2FSI(sb) ((sb->s_fs_info)) #define S2SMI(sb) ((struct smfs_super_info *) (sb->s_fs_info)) #define S2CSB(sb) (((struct smfs_super_info *) (sb->s_fs_info))->smsi_sb) #endif @@ -159,14 +163,21 @@ struct fs_extent{ #define SIZE2BLKS(size, inode) ((size + (I2CI(inode)->i_blksize)) >> (I2CI(inode)->i_blkbits)) #define OFF2BLKS(off, inode) (off >> (I2CI(inode)->i_blkbits)) -#define SM_DO_REC 0x1 -#define SM_INIT_REC 0x2 -#define SM_CACHE_HOOK 0x4 -#define SM_OVER_WRITE 0x8 -#define SM_DIRTY_WRITE 0x10 +/* SMFS external flags and methods */ +#define SM_ALL_PLG 0x80L + +#define SM_KML_PLG 0x1L +#define SM_DO_REC SM_KML_PLG + +//#define SM_INIT_REC 0x2 +//#define SM_CACHE_HOOK 0x4 +//#define SM_OVER_WRITE 0x8 +//#define SM_DIRTY_WRITE 0x10 #define SM_DO_COW 0x20 #define SM_DO_COWED 0x40 +#define SM_HND_IBLOCKS 0x80 +/* #define SMFS_DO_REC(smfs_info) (smfs_info->smsi_flags & SM_DO_REC) #define SMFS_SET_REC(smfs_info) (smfs_info->smsi_flags |= SM_DO_REC) #define SMFS_CLEAN_REC(smfs_info) (smfs_info->smsi_flags &= ~SM_DO_REC) @@ -194,7 +205,7 @@ struct fs_extent{ #define SMFS_INODE_DIRTY_WRITE(inode) (I2SMI(inode)->smi_flags & SM_DIRTY_WRITE) #define SMFS_SET_INODE_DIRTY_WRITE(inode) (I2SMI(inode)->smi_flags |= SM_DIRTY_WRITE) #define SMFS_CLEAN_INODE_DIRTY_WRITE(inode) (I2SMI(inode)->smi_flags &= ~SM_DIRTY_WRITE) - +*/ #define SMFS_DO_COW(smfs_info) (smfs_info->smsi_flags & SM_DO_COW) #define SMFS_SET_COW(smfs_info) (smfs_info->smsi_flags |= SM_DO_COW) #define SMFS_CLEAN_COW(smfs_info) (smfs_info->smsi_flags &= ~SM_DO_COW) @@ -207,10 +218,13 @@ struct fs_extent{ #define SMFS_DO_INODE_COWED(inode) (I2SMI(inode)->smi_flags & SM_DO_COWED) #define SMFS_CLEAN_INODE_COWED(inode) (I2SMI(inode)->smi_flags &= ~SM_DO_COWED) +#define SMFS_DO_HND_IBLOCKS(smfs_info) (smfs_info->smsi_flags & SM_HND_IBLOCKS) +#define SMFS_SET_HND_IBLOCKS(smfs_info) (smfs_info->smsi_flags |= SM_HND_IBLOCKS) +#define SMFS_CLEAN_HND_IBLOCKS(smfs_info) (smfs_info->smsi_flags &= ~SM_HND_IBLOCKS) -#define LVFS_SMFS_BACK_ATTR "lvfs_back_attr" - +//#define LVFS_SMFS_BACK_ATTR "lvfs_back_attr" +#if 0 #define REC_COUNT_BIT 0 #define REC_COUNT_MASK 0x01 /*0001*/ #define REC_OP_BIT 1 @@ -222,8 +236,8 @@ struct fs_extent{ #define REC_GET_OID_BIT 5 #define REC_GET_OID_MASK 0x20 /*100000*/ -#define REC_PACK_TYPE_BIT 6 -#define REC_PACK_TYPE_MASK 0x1C0 /*111000000*/ +//#define REC_PACK_TYPE_BIT 6 +//#define REC_PACK_TYPE_MASK 0x1C0 /*111000000*/ #define SET_REC_COUNT_FLAGS(flag, count_flag) \ (flag |= count_flag << REC_COUNT_BIT) @@ -255,11 +269,11 @@ struct fs_extent{ #define GET_REC_PACK_TYPE_INDEX(flag) \ ((flag & REC_PACK_TYPE_MASK) >> REC_PACK_TYPE_BIT) -#define SMFS_REC_ALL 0x1 -#define SMFS_REC_BY_COUNT 0x0 +//#define SMFS_REC_ALL 0x1 +//#define SMFS_REC_BY_COUNT 0x0 -#define SMFS_REINT_REC 0x1 -#define SMFS_UNDO_REC 0x2 +//#define SMFS_REINT_REC 0x1 +//#define SMFS_UNDO_REC 0x2 #define SMFS_WRITE_KML 0x1 #define SMFS_DEC_LINK 0x1 @@ -273,36 +287,38 @@ struct fs_extent{ (GET_REC_COUNT_FLAGS(flag) == SMFS_REC_ALL) #define SMFS_DO_REC_BY_COUNT(flag) \ (GET_REC_COUNT_FLAGS(flag) == SMFS_REC_BY_COUNT) + #define SMFS_DO_WRITE_KML(flag) \ (GET_REC_WRITE_KML_FLAGS(flag) == SMFS_WRITE_KML) + #define SMFS_DO_DEC_LINK(flag) \ (GET_REC_DEC_LINK_FLAGS(flag) == SMFS_DEC_LINK) #define SMFS_DO_GET_OID(flag) \ (GET_REC_GET_OID_FLAGS(flag) == SMFS_GET_OID) - +#endif /*DIRTY flags of write ops*/ #define REINT_EXTENTS_FLAGS "replay_flags" #define SMFS_DIRTY_WRITE 0x01 #define SMFS_OVER_WRITE 0x02 - static inline void duplicate_inode(struct inode *dst_inode, struct inode *src_inode) { dst_inode->i_mode = src_inode->i_mode; dst_inode->i_uid = src_inode->i_uid; dst_inode->i_gid = src_inode->i_gid; - dst_inode->i_nlink = src_inode->i_nlink; + //dst_inode->i_nlink = src_inode->i_nlink; dst_inode->i_size = src_inode->i_size; dst_inode->i_atime = src_inode->i_atime; dst_inode->i_ctime = src_inode->i_ctime; dst_inode->i_mtime = src_inode->i_mtime; dst_inode->i_blksize = src_inode->i_blksize; dst_inode->i_version = src_inode->i_version; - dst_inode->i_state = src_inode->i_state; + //dst_inode->i_state = src_inode->i_state; dst_inode->i_generation = src_inode->i_generation; - + dst_inode->i_flags = src_inode->i_flags; + /* This is to make creating special files working. */ dst_inode->i_rdev = src_inode->i_rdev; } @@ -312,20 +328,36 @@ static inline void post_smfs_inode(struct inode *inode, { if (inode && cache_inode) { duplicate_inode(inode, cache_inode); - /*Here we must release the cache_inode, - *Otherwise we will have no chance to - *do it + /* + * here we must release the cache_inode, otherwise we will have + * no chance to do it later. */ - cache_inode->i_state &=~I_LOCK; + //cache_inode->i_state &=~I_LOCK; inode->i_blocks = cache_inode->i_blocks; } } +static inline void i_nlink_inc(struct inode * inode) +{ + inode->i_nlink++; + if (I2SMI(inode)) + I2CI(inode)->i_nlink++; +} + +static inline void i_nlink_dec(struct inode * inode) +{ + inode->i_nlink--; + if (I2SMI(inode)) + I2CI(inode)->i_nlink--; +} + static inline void pre_smfs_inode(struct inode *inode, struct inode *cache_inode) { - if (inode && cache_inode) - duplicate_inode(cache_inode, inode); + if (inode && cache_inode) { + cache_inode->i_flags = inode->i_flags; + cache_inode->i_generation = inode->i_generation; + } } /* instantiate a file handle to the cache file */ @@ -360,20 +392,8 @@ static inline void duplicate_sb(struct super_block *dst_sb, dst_sb->s_flags = src_sb->s_flags; } -static inline void d_unalloc(struct dentry *dentry) -{ -#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)) - list_del(&dentry->d_hash); - INIT_LIST_HEAD(&dentry->d_hash); -#else - hlist_del_init(&dentry->d_hash); - dentry->d_flags |= DCACHE_UNHASHED; -#endif - dput(dentry); /* this will free the dentry memory */ -} - static inline int smfs_get_dentry_name_index(struct dentry *dentry, - struct qstr *str, + struct qstr *str, int *index) { char *name = (char *)dentry->d_name.name; @@ -396,11 +416,9 @@ static inline int smfs_get_dentry_name_index(struct dentry *dentry, str->hash = end_name_hash(hash); OBD_ALLOC(str_name, len + 1); memcpy(str_name, dentry->d_name.name, len); - str->len = len; - str->name = str_name; - if (index && c == ':') { + qstr_assign(str, str_name, len); + if (index && c == ':') *index = simple_strtoul(name, 0, 0); - } return 0; } @@ -410,6 +428,28 @@ static inline void smfs_free_dentry_name(struct qstr *str) OBD_FREE(name, str->len + 1); } +static int smfs_d_delete(struct dentry * dentry) +{ + return 1; +} + +static struct dentry_operations sm_dop = { + .d_delete = smfs_d_delete, +}; + + +static inline void smfs_update_dentry(struct dentry *dentry, + struct dentry *cache_dentry) +{ + if (DCACHE_CROSS_REF & cache_dentry->d_flags) { + dentry->d_flags |= DCACHE_CROSS_REF; + dentry->d_generation = cache_dentry->d_generation; + dentry->d_mdsnum = cache_dentry->d_mdsnum; + dentry->d_fid = cache_dentry->d_fid; + dentry->d_inum = cache_dentry->d_inum; + } +} + static inline struct dentry *pre_smfs_dentry(struct dentry *parent_dentry, struct inode *cache_inode, struct dentry *dentry) @@ -419,69 +459,31 @@ static inline struct dentry *pre_smfs_dentry(struct dentry *parent_dentry, cache_dentry = d_alloc(parent_dentry, &dentry->d_name); if (!cache_dentry) RETURN(NULL); + + //wantedi support + cache_dentry->d_fsdata = dentry->d_fsdata; + + //cmd support + smfs_update_dentry(cache_dentry, dentry); + if (!parent_dentry) cache_dentry->d_parent = cache_dentry; - if (cache_inode) + + if (cache_inode) { + atomic_inc(&cache_inode->i_count); //d_instantiate suppose that d_add(cache_dentry, cache_inode); + } + //defines d_delete op to force killing dentry + cache_dentry->d_op = &sm_dop; + RETURN(cache_dentry); } static inline void post_smfs_dentry(struct dentry *cache_dentry) { - if (!cache_dentry) - return; - if (cache_dentry->d_inode) - igrab(cache_dentry->d_inode); - d_unalloc(cache_dentry); -} - -static inline int lookup_by_path(char *path, int flags, struct nameidata *nd) -{ - struct dentry *dentry = NULL; - int rc = 0; - -#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)) - if (path_init(path, flags, nd)) { -#else - if (path_lookup(path, flags, nd)) { -#endif - rc = path_walk(path, nd); - if (rc) - RETURN(rc); - } else { - RETURN(-EINVAL); - } - - dentry = nd->dentry; - - if (!dentry->d_inode || is_bad_inode(dentry->d_inode)) { - path_release(nd); - RETURN(-ENODEV); - } - RETURN(rc); -} - -/*FIXME there should be more conditions in this check*/ -static inline int smfs_do_rec(struct inode *inode) -{ - struct super_block *sb = inode->i_sb; - struct smfs_super_info *smfs_info = S2SMI(sb); - - if (SMFS_DO_REC(smfs_info) && SMFS_INIT_REC(smfs_info) && - SMFS_DO_INODE_REC(inode)) - return 1; - return 0; -} - -static inline int smfs_cache_hook(struct inode *inode) -{ - struct smfs_super_info *smfs_info = I2CSB(inode); - - if (SMFS_CACHE_HOOK(smfs_info) && SMFS_INIT_REC(smfs_info) && - SMFS_INODE_CACHE_HOOK(inode)) - return 1; - else - return 0; + if (cache_dentry) + dput(cache_dentry); + } static inline int smfs_do_cow(struct inode *inode) @@ -494,32 +496,9 @@ static inline int smfs_do_cow(struct inode *inode) return 0; } - -/* XXX BUG 3188 -- must return to one set of opcodes */ -#define SMFS_TRANS_OP(inode, op) \ -{ \ - if (smfs_do_rec(inode)) \ - op = op | 0x10; \ - if (smfs_cache_hook(inode)) \ - op = op | 0x20; \ -} - -extern int smfs_start_rec(struct super_block *sb, struct vfsmount *mnt); -extern int smfs_stop_rec(struct super_block *sb); extern int smfs_write_extents(struct inode *dir, struct dentry *dentry, unsigned long from, unsigned long num); -extern int smfs_rec_setattr(struct inode *dir, struct dentry *dentry, - struct iattr *attr); extern int smfs_rec_precreate(struct dentry *dentry, int *num, struct obdo *oa); -extern int smfs_rec_md(struct inode *inode, void * lmm, int lmm_size); extern int smfs_rec_unpack(struct smfs_proc_args *args, char *record, char **pbuf, int *opcode); - - -extern int smfs_post_setup(struct super_block *sb, struct vfsmount *mnt); -extern int smfs_post_cleanup(struct super_block *sb); -extern struct inode *smfs_get_inode (struct super_block *sb, ino_t hash, - struct inode *dir, int index); - -extern int is_smfs_sb(struct super_block *sb); #endif /* _LUSTRE_SMFS_H */