#if 0
int obdfs_brw(struct inode *dir, int rw, struct page *page, int create)
{
- return iops(dir)->o_brw(rw, iid(dir), dir, page, create);
+ return IOPS(dir, brw)(rw, IID(dir), dir, page, create);
}
#endif
int obdfs_readpage(struct dentry *dentry, struct page *page)
{
struct inode *inode = dentry->d_inode;
- int rc;
+ struct obdo *oa;
+ int err;
ENTRY;
- /* XXX flush stuff */
PDEBUG(page, "READ");
- rc = iops(inode)->o_brw(READ, iid(inode),inode, page, 0);
- if (rc == PAGE_SIZE ) {
+ oa = obdo_alloc();
+ if (!oa) {
+ printk("obdfs_readpage: obdo_alloc failure\n");
+ EXIT;
+ return -ENOMEM;
+ }
+
+ oa->o_id = inode->i_ino;
+ err = IOPS(inode, brw)(READ, IID(inode), oa, (char *)page_address(page),
+ PAGE_SIZE, (page->index) << PAGE_SHIFT, 0);
+ obdo_to_inode(inode, oa); /* copy o_blocks to i_blocks */
+ obdo_free(oa);
+
+ if (err == PAGE_SIZE ) {
SetPageUptodate(page);
UnlockPage(page);
}
PDEBUG(page, "READ");
- if ( rc == PAGE_SIZE )
- rc = 0;
- return rc;
+ if ( err == PAGE_SIZE )
+ err = 0;
+ EXIT;
+ return err;
+}
+
+static kmem_cache_t *obdfs_wreq_cachep;
+
+int obdfs_init_wreqcache(void)
+{
+ /* XXX need to free this somewhere? */
+ ENTRY;
+ obdfs_wreq_cachep = kmem_cache_create("obdfs_wreq",
+ sizeof(struct obdfs_wreq),
+ 0, SLAB_HWCACHE_ALIGN,
+ NULL, NULL);
+ if (obdfs_wreq_cachep == NULL) {
+ EXIT;
+ return -ENOMEM;
+ }
+ EXIT;
+ return 0;
+}
+
+/*
+ * 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.
+ */
+static struct obdfs_wreq *
+obdfs_find_in_page_cache(struct inode *inode, struct page *page)
+{
+ struct list_head *list_head = &OBD_LIST(inode);
+ struct obdfs_wreq *head, *wreq;
+
+ ENTRY;
+ CDEBUG(D_INODE, "looking for inode %ld page %p\n", inode->i_ino, page);
+ if (list_empty(list_head)) {
+ CDEBUG(D_INODE, "empty list\n");
+ EXIT;
+ return NULL;
+ }
+ wreq = head = WREQ(list_head->next);
+ do {
+ CDEBUG(D_INODE, "checking page %p\n", wreq->wb_page);
+ if (wreq->wb_page == page) {
+ CDEBUG(D_INODE, "found page %p in list\n", page);
+ EXIT;
+ return wreq;
+ }
+ } while ((wreq = WB_NEXT(wreq)) != head);
+ EXIT;
+ return NULL;
}
+
+/*
+ * Remove a writeback request from a list
+ */
+static inline int
+obdfs_remove_from_page_cache(struct obdfs_wreq *wreq)
+{
+ struct inode *inode = wreq->wb_inode;
+ struct page *page = wreq->wb_page;
+ struct obdo *oa;
+ int err;
+
+ ENTRY;
+ CDEBUG(D_INODE, "removing inode %ld page %p, wreq: %p\n",
+ inode->i_ino, page, wreq);
+ oa = obdo_alloc();
+ if (!oa) {
+ printk("obdfs_remove_from_page_cache: obdo_alloc failure\n");
+ EXIT;
+ return -ENOMEM;
+ }
+ oa->o_id = inode->i_ino;
+ err = IOPS(inode, brw)(WRITE, IID(inode), oa,(char *)page_address(page),
+ PAGE_SIZE, (page->index) << PAGE_SHIFT, 1);
+ obdo_to_inode(inode, oa); /* copy o_blocks to i_blocks */
+ /* 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(&wreq->wb_list);
+ kmem_cache_free(obdfs_wreq_cachep, wreq);
+
+ EXIT;
+ return err;
+}
+
+/*
+ * Add a page to the write request cache list for later writing
+ */
+static int
+obdfs_add_to_page_cache(struct inode *inode, struct page *page)
+{
+ struct obdfs_wreq *wreq;
+
+ ENTRY;
+ wreq = kmem_cache_alloc(obdfs_wreq_cachep, SLAB_KERNEL);
+ CDEBUG(D_INODE, "adding inode %ld page %p, wreq: %p\n",
+ inode->i_ino, page, wreq);
+ if (!wreq) {
+ EXIT;
+ return -ENOMEM;
+ }
+ memset(wreq, 0, sizeof(*wreq));
+
+ wreq->wb_page = page;
+ wreq->wb_inode = inode;
+
+ get_page(wreq->wb_page);
+ list_add(&wreq->wb_list, &OBD_LIST(inode));
+
+ /* For testing purposes, we write out the page here.
+ * In the future, a flush daemon will write out the page.
+ */
+ wreq = obdfs_find_in_page_cache(inode, page);
+ if (!wreq) {
+ CDEBUG(D_INODE, "XXXX Can't find page after adding it!!!\n");
+ return -EINVAL;
+ } else
+ return obdfs_remove_from_page_cache(wreq);
+
+ return 0;
+}
+
+
/* returns the page unlocked, but with a reference */
int obdfs_writepage(struct dentry *dentry, struct page *page)
{
struct inode *inode = dentry->d_inode;
- int rc;
+ int err;
ENTRY;
PDEBUG(page, "WRITEPAGE");
/* XXX flush stuff */
+ err = obdfs_add_to_page_cache(inode, page);
- rc = iops(inode)->o_brw(WRITE, iid(inode), inode, page, 1);
-
- SetPageUptodate(page);
+ if (!err)
+ SetPageUptodate(page);
PDEBUG(page,"WRITEPAGE");
- return rc;
+ return err;
}
/*
* If the writer ends up delaying the write, the writer needs to
* increment the page use counts until he is done with the page.
*/
-int obdfs_write_one_page(struct file *file, struct page *page, unsigned long offset, unsigned long bytes, const char * buf)
+int obdfs_write_one_page(struct file *file, struct page *page,
+ unsigned long offset, unsigned long bytes,
+ const char * buf)
{
long status;
struct inode *inode = file->f_dentry->d_inode;
ENTRY;
if ( !Page_Uptodate(page) ) {
- status = iops(inode)->o_brw(READ, iid(inode), inode, page, 1);
+ struct obdo *oa;
+ oa = obdo_alloc();
+ if (!oa) {
+ printk("obdfs_write_one_page: obdo_alloc failure\n");
+ EXIT;
+ return -ENOMEM;
+ }
+ oa->o_id = inode->i_ino;
+ status = IOPS(inode, brw)(READ, IID(inode), oa,
+ (char *)page_address(page), PAGE_SIZE, (page->index) << PAGE_SHIFT, 1);
+ obdo_to_inode(inode, oa); /* copy o_blocks to i_blocks */
+ obdo_free(oa);
+
if (status == PAGE_SIZE ) {
SetPageUptodate(page);
} else {
modeled on NFS code.
*/
-struct page *obdfs_getpage(struct inode *inode, unsigned long offset, int create, int locked)
+struct page *obdfs_getpage(struct inode *inode, unsigned long offset,
+ int create, int locked)
{
struct page *page_cache;
struct page ** hash;
struct page * page;
- int rc;
+ struct obdo *oa;
+ int err;
ENTRY;
hash = page_hash(&inode->i_data, offset);
page = grab_cache_page(&inode->i_data, offset);
- PDEBUG(page, "GETPAGE: got page - before reading\n");
+ PDEBUG(page, "obdfs_getpage: got page - before reading\n");
/* now check if the data in the page is up to date */
if ( Page_Uptodate(page)) {
if (!locked)
/* it's not: read it */
if (! page) {
- printk("get_page_map says no dice ...\n");
- return 0;
+ printk("obdfs_getpage: says no dice ...\n");
+ return NULL;
}
- rc = iops(inode)->o_brw(READ, iid(inode), inode, page, create);
- if ( rc != PAGE_SIZE ) {
+ oa = obdo_alloc();
+ if (!oa) {
+ printk("obdfs_getpage: obdo_alloc failure\n");
+ EXIT;
+ return NULL;
+ }
+ oa->o_id = inode->i_ino;
+ err = IOPS(inode, brw)(READ, IID(inode), oa, (char *)page_address(page),
+ PAGE_SIZE, (page->index) << PAGE_SHIFT, create);
+
+ obdo_to_inode(inode, oa); /* XXX to copy o_blocks */
+ obdo_free(oa);
+
+ if ( err != PAGE_SIZE ) {
SetPageError(page);
UnlockPage(page);
return page;
git://git.whamcloud.com / fs / lustre-release.git / blobdiff