X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Finclude%2Flinux%2Fobdfs.h;h=474a5e3cc75c725c05fc9584a73f5f850489b599;hp=cfc9f851d382b32f83af9c393357b20c13dbf5e2;hb=c23034aa2b2101e0220d811161613983f58821a2;hpb=86ada49822948e9cf3a8488b3297f111bcaef72e diff --git a/lustre/include/linux/obdfs.h b/lustre/include/linux/obdfs.h index cfc9f85..474a5e3 100644 --- a/lustre/include/linux/obdfs.h +++ b/lustre/include/linux/obdfs.h @@ -17,13 +17,24 @@ /* super.c */ void obdfs_read_inode(struct inode *inode); +/* flush.c */ +int obdfs_flushd_init(void); +int obdfs_flushd_cleanup(void); +int obdfs_flush_reqs(struct list_head *inode_list, int check_time); +void obdfs_flush_dirty_pages(int check_time); /* rw.c */ -int obdfs_init_wreqcache(void); +int obdfs_do_writepage(struct inode *, struct page *, int sync); +int obdfs_init_pgrqcache(void); +void obdfs_cleanup_pgrqcache(void); int obdfs_readpage(struct dentry *dentry, struct page *page); int obdfs_writepage(struct dentry *dentry, struct page *page); -struct page *obdfs_getpage(struct inode *inode, unsigned long offset, int create, int locked); -int obdfs_write_one_page(struct file *file, struct page *page, unsigned long offset, unsigned long bytes, const char * buf); +struct page *obdfs_getpage(struct inode *inode, unsigned long offset, + int create, int locked); +int obdfs_write_one_page(struct file *file, struct page *page, + unsigned long offset, unsigned long bytes, + const char * buf); +void obdfs_dequeue_reqs(struct inode *inode); /* namei.c */ struct dentry *obdfs_lookup(struct inode * dir, struct dentry *dentry); @@ -32,60 +43,166 @@ int obdfs_mkdir(struct inode *dir, struct dentry *dentry, int mode); int obdfs_rmdir(struct inode *dir, struct dentry *dentry); int obdfs_unlink(struct inode *dir, struct dentry *dentry); int obdfs_mknod(struct inode *dir, struct dentry *dentry, int mode, int rdev); -int obdfs_symlink(struct inode *dir, struct dentry *dentry, const char *symname); -int obdfs_link(struct dentry *old_dentry, struct inode *dir, struct dentry *dentry); -int obdfs_rename(struct inode *old_dir, struct dentry *old_dentry, struct inode *new_dir, struct dentry *new_dentry); +int obdfs_symlink(struct inode *dir, struct dentry *dentry, + const char *symname); +int obdfs_link(struct dentry *old_dentry, struct inode *dir, + struct dentry *dentry); +int obdfs_rename(struct inode *old_dir, struct dentry *old_dentry, + struct inode *new_dir, struct dentry *new_dentry); + /* dir.c */ int obdfs_check_dir_entry (const char * function, struct inode * dir, - struct ext2_dir_entry_2 * de, - struct page * page, - unsigned long offset); + struct ext2_dir_entry_2 * de, struct page * page, + unsigned long offset); + /* symlink.c */ int obdfs_readlink (struct dentry *, char *, int); -struct dentry *obdfs_follow_link(struct dentry *, struct dentry *, unsigned int); +struct dentry *obdfs_follow_link(struct dentry *, struct dentry *, + unsigned int); + -struct obdfs_wreq { - struct list_head wb_list; /* linked list of req's */ - struct inode *wb_inode; /* dentry referenced */ - struct page *wb_page; /* page to be written */ +/* list of all OBDFS super blocks */ +struct list_head obdfs_super_list; + +struct obdfs_pgrq { + struct list_head rq_plist; /* linked list of req's */ + unsigned long rq_jiffies; + struct page *rq_page; /* page to be written */ }; + +inline void obdfs_pgrq_del(struct obdfs_pgrq *pgrq); +int obdfs_do_vec_wr(struct inode **inodes, obd_count num_io, obd_count num_oa, + struct obdo **obdos, obd_count *oa_bufs, + struct page **pages, char **bufs, obd_size *counts, + obd_off *offsets, obd_flag *flags); + + struct obdfs_sb_info { - struct obd_conn osi_conn; - struct super_block *osi_super; - struct obd_device *osi_obd; - struct obd_ops *osi_ops; - ino_t osi_rootino; /* which root inode */ - int osi_minor; /* minor of /dev/obdX */ - struct list_head osi_list; /* linked list of inodes to write */ + struct list_head osi_list; /* list of supers */ + struct obd_conn osi_conn; + struct super_block *osi_super; + struct obd_device *osi_obd; + struct obd_ops *osi_ops; + ino_t osi_rootino; /* number of root inode */ + int osi_minor; /* minor of /dev/obdX */ + struct list_head osi_inodes; /* list of dirty inodes */ + struct semaphore osi_list_mutex; +}; + +struct obdfs_inode_info { + int oi_flags; + struct list_head oi_inodes; + struct list_head oi_pages; + char oi_inline[OBD_INLINESZ]; }; +static inline struct obdfs_inode_info *obdfs_i2info(struct inode *inode) +{ + return (struct obdfs_inode_info *)&(inode->u.generic_ip); +} -#define WB_NEXT(req) ((struct obdfs_wreq *) ((req)->wb_list.next)) -/* XXX page list should go on each inode instead of supberblock */ -#define OBD_LIST(inode) (((struct obdfs_sb_info *)(&(inode)->i_sb->u.generic_sbp))->osi_list) -#define WREQ(entry) (list_entry(entry, struct obdfs_wreq, wb_list)) +static inline struct obdfs_sb_info *obdfs_i2sbi(struct inode *inode) +{ + return (struct obdfs_sb_info *) &(inode->i_sb->u.generic_sbp); +} + +static inline struct list_head *obdfs_iplist(struct inode *inode) +{ + struct obdfs_inode_info *info = obdfs_i2info(inode); + + return &info->oi_pages; +} + +static inline struct list_head *obdfs_islist(struct inode *inode) +{ + struct obdfs_inode_info *info = obdfs_i2info(inode); + + return &info->oi_inodes; +} + +static inline struct list_head *obdfs_slist(struct inode *inode) +{ + struct obdfs_sb_info *sbi = obdfs_i2sbi(inode); + + return &sbi->osi_inodes; +} + +#define obd_down(mutex) {\ + CDEBUG(D_INODE, "got lock at %s, %d\n", __FUNCTION__, __LINE__);\ + down(mutex);\ +} + +#define obd_up(mutex) {\ + up(mutex);\ + CDEBUG(D_INODE, "free lock at %s, %d\n", __FUNCTION__, __LINE__);\ +} + +static inline void obdfs_print_plist(struct inode *inode) +{ + struct list_head *page_list = obdfs_iplist(inode); + struct list_head *tmp; + + CDEBUG(D_INODE, "inode %ld: page", inode->i_ino); + /* obd_down(&obdfs_i2sbi(inode)->osi_list_mutex); */ + if (list_empty(page_list)) { + printk(" list empty\n"); + obd_up(&obdfs_i2sbi(inode)->osi_list_mutex); + return; + } + + tmp = page_list; + while ( (tmp = tmp->next) != page_list) { + struct obdfs_pgrq *pgrq; + pgrq = list_entry(tmp, struct obdfs_pgrq, rq_plist); + printk(" %p", pgrq->rq_page); + } + printk("\n"); + /* obd_up(&obdfs_i2sbi(inode)->osi_list_mutex); */ +} void obdfs_sysctl_init(void); void obdfs_sysctl_clean(void); - extern struct file_operations obdfs_file_operations; extern struct inode_operations obdfs_file_inode_operations; extern struct inode_operations obdfs_dir_inode_operations; extern struct inode_operations obdfs_symlink_inode_operations; -static inline struct obd_ops *iops(struct inode *i) +static inline int obdfs_has_inline(struct inode *inode) { - struct obdfs_sb_info *sbi = (struct obdfs_sb_info *) &i->i_sb->u.generic_sbp; - return sbi->osi_ops; + return (obdfs_i2info(inode)->oi_flags & OBD_FL_INLINEDATA); } -static inline struct obd_conn *iid(struct inode *i) +static void inline obdfs_from_inode(struct obdo *oa, struct inode *inode) { - struct obdfs_sb_info *sbi = (struct obdfs_sb_info *) &i->i_sb->u.generic_sbp; - return &sbi->osi_conn; -} + struct obdfs_inode_info *oinfo = obdfs_i2info(inode); + + CDEBUG(D_INODE, "src inode %ld, dst obdo %ld valid 0x%08x\n", + inode->i_ino, (long)oa->o_id, oa->o_valid); + obdo_from_inode(oa, inode); + if (obdfs_has_inline(inode)) { + CDEBUG(D_INODE, "copying inline data from inode to obdo\n"); + memcpy(oa->o_inline, oinfo->oi_inline, OBD_INLINESZ); + oa->o_obdflags |= OBD_FL_INLINEDATA; + oa->o_valid |= OBD_MD_FLINLINE; + } +} /* obdfs_from_inode */ + +static void inline obdfs_to_inode(struct inode *inode, struct obdo *oa) +{ + struct obdfs_inode_info *oinfo = obdfs_i2info(inode); + + CDEBUG(D_INODE, "src obdo %ld valid 0x%08x, dst inode %ld\n", + (long)oa->o_id, oa->o_valid, inode->i_ino); + obdo_to_inode(inode, oa); + + if (obdo_has_inline(oa)) { + CDEBUG(D_INODE, "copying inline data from obdo to inode\n"); + memcpy(oinfo->oi_inline, oa->o_inline, OBD_INLINESZ); + oinfo->oi_flags |= OBD_FL_INLINEDATA; + } +} /* obdfs_to_inode */ #define NOLOCK 0 #define LOCKED 1