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);
+void obdfs_dequeue_reqs(struct inode *inode);
/* namei.c */
struct dentry *obdfs_lookup(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);
/* list of all OBDFS super blocks */
struct list_head obdfs_super_list;
-struct obdfs_super_entry {
- struct list_head sl_chain;
- struct obdfs_sb_info *sl_sbi;
-};
struct obdfs_pgrq {
- struct list_head rq_ilist; /* linked list of req's */
- struct list_head rq_slist; /* linked list of req's */
- unsigned long rq_jiffies;
- struct inode *rq_inode; /* dentry referenced */
+ 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 super_block *sb, obd_count *num_io,
- struct obdo **obdos,
- struct page **pages, char **bufs, obd_size *counts,
- obd_off *offsets, obd_flag *flags);
+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 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; /* which root inode */
- int osi_minor; /* minor of /dev/obdX */
- struct list_head osi_pages; /* linked list of inodes to write */
+ 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];
};
+#define OBDFS_INFO(inode) ((struct obdfs_inode_info *)(&(inode)->u.generic_ip))
+
+static inline struct obdfs_sb_info *obdfs_i2sbi(struct inode *inode)
+{
+ struct obdfs_sb_info *sbi;
+
+ sbi = (struct obdfs_sb_info *) &(inode->i_sb->u.generic_sbp);
+ return sbi;
+}
-static inline struct list_head *obdfs_ilist(struct inode *inode)
+static inline struct list_head *obdfs_iplist(struct inode *inode)
{
struct obdfs_inode_info *info = (struct obdfs_inode_info *)&inode->u.generic_ip;
return &info->oi_pages;
}
-static inline struct list_head *obdfs_slist(struct inode *inode) {
- struct obdfs_sb_info *sbi = (struct obdfs_sb_info *)(&inode->i_sb->u.generic_sbp);
- return &sbi->osi_pages;
+static inline struct list_head *obdfs_islist(struct inode *inode)
+{
+ struct obdfs_inode_info *info = (struct obdfs_inode_info *)&inode->u.generic_ip;
+
+ return &info->oi_inodes;
}
-#define OBDFS_INFO(inode) ((struct obdfs_inode_info *)(&(inode)->u.generic_ip))
+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);
{
struct obdfs_inode_info *oinfo = OBDFS_INFO(inode);
- CDEBUG(D_INODE, "inode %ld (%p)\n", inode->i_ino, 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, "inode has inline data\n");
+ 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;
{
struct obdfs_inode_info *oinfo = OBDFS_INFO(inode);
- CDEBUG(D_INODE, "inode %ld (%p)\n", inode->i_ino, 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, "obdo has inline data\n");
+ 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;
}
git://git.whamcloud.com / fs / lustre-release.git / blobdiff