#include <linux/obd_ext2.h>
#include <linux/obdfs.h>
-int console_loglevel;
+
+int obdfs_flush_reqs(struct list_head *page_list,
+ int flush_inode, int check_time);
+
/* SYNCHRONOUS I/O for an inode */
static int obdfs_brw(int rw, struct inode *inode, struct page *page, int create)
{
- struct obdo *obdo;
- obd_size count = PAGE_SIZE;
- int err;
+ obd_count num_io = 1;
+ struct obdo *oa;
+ char *buf = (char *)page_address(page);
+ obd_size count = PAGE_SIZE;
+ obd_off offset = ((obd_off)page->index) << PAGE_SHIFT;
+ obd_flag flags = create ? OBD_BRW_CREATE : 0;
+ int err;
ENTRY;
- obdo = obdo_fromid(IID(inode), inode->i_ino);
- if ( IS_ERR(obdo) ) {
+ oa = obdo_fromid(IID(inode), inode->i_ino, OBD_MD_FLNOTOBD);
+ if ( IS_ERR(oa) ) {
EXIT;
- return PTR_ERR(obdo);
+ return PTR_ERR(oa);
}
+ obdfs_from_inode(oa, inode);
- err = IOPS(inode, brw)(rw, IID(inode), obdo, (char *)page_address(page),
- &count, (page->index) >> PAGE_SHIFT, create);
+ err = IOPS(inode, brw)(rw, IID(inode), &num_io, &oa, &buf, &count,
+ &offset, &flags);
if ( !err )
- obdfs_to_inode(inode, obdo); /* copy o_blocks to i_blocks */
+ obdfs_to_inode(inode, oa); /* copy o_blocks to i_blocks */
- obdo_free(obdo);
+ obdo_free(oa);
EXIT;
return err;
return 0;
} /* obdfs_init_wreqcache */
+inline void obdfs_pgrq_del(struct obdfs_pgrq *pgrq)
+{
+ list_del(&pgrq->rq_ilist);
+ list_del(&pgrq->rq_slist);
+ kmem_cache_free(obdfs_pgrq_cachep, pgrq);
+}
+
void obdfs_cleanup_pgrqcache(void)
{
ENTRY;
* Find a specific page in the page cache. If it is found, we return
* the write request struct associated with it, if not found return NULL.
*/
+#if 0
static struct obdfs_pgrq *
obdfs_find_in_page_cache(struct inode *inode, struct page *page)
{
EXIT;
return NULL;
} /* obdfs_find_in_page_cache */
+#endif
-/*
- * Remove a writeback request from a list
- */
-static inline int
-obdfs_remove_from_page_cache(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)
{
- struct inode *inode = pgrq->rq_inode;
- struct page *page = pgrq->rq_page;
+ int last_io = *num_io;
int err;
-
+ struct obdfs_sb_info *sbi = (struct obdfs_sb_info *)&sb->u.generic_sbp;
ENTRY;
- CDEBUG(D_INODE, "writing inode %ld page %p, pgrq: %p\n",
- inode->i_ino, page, pgrq);
- OIDEBUG(inode);
- PDEBUG(page, "REM_CACHE");
- err = obdfs_brw(WRITE, inode, page, 1);
- /* XXX probably should handle error here somehow. I think that
- * ext2 also does the same thing - discard write even if error?
- */
- put_page(page);
- list_del(&pgrq->rq_list);
- kmem_cache_free(obdfs_pgrq_cachep, pgrq);
- OIDEBUG(inode);
+ CDEBUG(D_INODE, "writing %d pages in vector\n", last_io);
+ err = OPS(sb, brw)(WRITE, &sbi->osi_conn, num_io, obdos,
+ bufs, counts, offsets, flags);
+
+ do {
+ put_page(pages[--last_io]);
+ } while ( last_io > 0 );
EXIT;
return err;
-} /* obdfs_remove_from_page_cache */
+}
+
/*
* Add a page to the write request cache list for later writing
* ASYNCHRONOUS write method.
*/
-static int obdfs_add_to_page_cache(struct inode *inode, struct page *page)
+static int obdfs_add_page_to_cache(struct inode *inode, struct page *page)
{
struct obdfs_pgrq *pgrq;
+ int rc = 0;
ENTRY;
pgrq = kmem_cache_alloc(obdfs_pgrq_cachep, SLAB_KERNEL);
pgrq->rq_inode = inode;
get_page(pgrq->rq_page);
- list_add(&pgrq->rq_list, &OBDFS_LIST(inode));
+ list_add(&pgrq->rq_ilist, obdfs_ilist(inode));
+ list_add(&pgrq->rq_slist, obdfs_slist(inode));
- /* For testing purposes, we write out the page here.
- * In the future, a flush daemon will write out the page.
+ /* XXX For testing purposes, we write out the page here.
+ * In the future, a flush daemon will write out the page.
return 0;
*/
- pgrq = obdfs_find_in_page_cache(inode, page);
- if (!pgrq) {
- CDEBUG(D_INODE, "XXXX Can't find page after adding it!!!\n");
- EXIT;
- return -EINVAL;
- }
-
- return obdfs_remove_from_page_cache(pgrq);
-} /* obdfs_add_to_page_cache */
+ rc = obdfs_flush_reqs(obdfs_slist(inode), 0, 0);
+ EXIT;
+ return rc;
+} /* obdfs_add_page_to_cache */
/* select between SYNC and ASYNC I/O methods */
if ( sync )
err = obdfs_brw(WRITE, inode, page, 1);
else
- err = obdfs_add_to_page_cache(inode, page);
+ err = obdfs_add_page_to_cache(inode, page);
if ( !err )
SetPageUptodate(page);
PDEBUG(page,"WRITEPAGE");
+ EXIT;
return err;
} /* obdfs_do_writepage */
git://git.whamcloud.com / fs / lustre-release.git / blobdiff