Updating obdfs/ext2obd methods for new obdo parameters.

[fs/lustre-release.git] / lustre / obdfs / rw.c

diff --git a/lustre/obdfs/rw.c b/lustre/obdfs/rw.c
index 558cfed..aa18c72 100644 (file)
--- a/lustre/obdfs/rw.c
+++ b/lustre/obdfs/rw.c
@@ -39,7 +39,7 @@ int console_loglevel;
 #if 0
 int obdfs_brw(struct inode *dir, int rw, struct page *page, int create)
 {
 #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
 
 }
 #endif
 


@@ -47,22 +47,33 @@ int obdfs_brw(struct inode *dir, int rw, struct page *page, int create)
 int obdfs_readpage(struct dentry *dentry, struct page *page)
 {
        struct inode *inode = dentry->d_inode;
 int obdfs_readpage(struct dentry *dentry, struct page *page)
 {
        struct inode *inode = dentry->d_inode;

-       struct obdfs_wreq *wreq;
-       int rc = 0;
+       struct obdo *oa;
+       int err;

 
         ENTRY;
        PDEBUG(page, "READ");
 
         ENTRY;
        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");
                SetPageUptodate(page);
                UnlockPage(page);
        } 
        PDEBUG(page, "READ");

-       if ( rc == PAGE_SIZE ) 
-               rc = 0;
-       } 
+       if ( err == PAGE_SIZE ) 
+               err = 0;

        EXIT;
        EXIT;

-       return rc;
+       return err;

 }
 
 static kmem_cache_t *obdfs_wreq_cachep;
 }
 
 static kmem_cache_t *obdfs_wreq_cachep;


@@ -123,12 +134,22 @@ obdfs_remove_from_page_cache(struct obdfs_wreq *wreq)
 {
        struct inode *inode = wreq->wb_inode;
        struct page *page = wreq->wb_page;
 {
        struct inode *inode = wreq->wb_inode;
        struct page *page = wreq->wb_page;

-       int rc;
+       struct obdo *oa;
+       int err;

 
        ENTRY;
        CDEBUG(D_INODE, "removing inode %ld page %p, wreq: %p\n",
               inode->i_ino, page, wreq);
 
        ENTRY;
        CDEBUG(D_INODE, "removing inode %ld page %p, wreq: %p\n",
               inode->i_ino, page, wreq);

-       rc = iops(inode)->o_brw(WRITE, iid(inode), inode, page, 1);
+       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?
         */
        /* XXX probably should handle error here somehow.  I think that
         *     ext2 also does the same thing - discard write even if error?
         */


@@ -137,7 +158,7 @@ obdfs_remove_from_page_cache(struct obdfs_wreq *wreq)
        kmem_cache_free(obdfs_wreq_cachep, wreq);
 
        EXIT;
        kmem_cache_free(obdfs_wreq_cachep, wreq);
 
        EXIT;

-       return rc;
+       return err;

 }
 
 /*
 }
 
 /*


@@ -182,17 +203,17 @@ obdfs_add_to_page_cache(struct inode *inode, struct page *page)
 int obdfs_writepage(struct dentry *dentry, struct page *page)
 {
         struct inode *inode = dentry->d_inode;
 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 */
 
         ENTRY;
        PDEBUG(page, "WRITEPAGE");
        /* XXX flush stuff */

-       rc = obdfs_add_to_page_cache(inode, page);
+       err = obdfs_add_to_page_cache(inode, page);

 
 

-       if (!rc)
+       if (!err)

                SetPageUptodate(page);
        PDEBUG(page,"WRITEPAGE");
                SetPageUptodate(page);
        PDEBUG(page,"WRITEPAGE");

-       return rc;
+       return err;

 }
 
 /*
 }
 
 /*


@@ -204,14 +225,28 @@ int obdfs_writepage(struct dentry *dentry, struct page *page)
  * If the writer ends up delaying the write, the writer needs to
  * increment the page use counts until he is done with the page.
  */
  * 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) ) {
 {
        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 { 
                if (status == PAGE_SIZE ) {
                        SetPageUptodate(page);
                } else { 


@@ -253,12 +288,14 @@ void report_inode(struct page * page) {
 
    modeled on NFS code.
 */
 
    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;
 {
        struct page *page_cache;
        struct page ** hash;
        struct page * page;

-       int rc;
+       struct obdo *oa;
+       int err;

 
         ENTRY;
 
 
         ENTRY;
 


@@ -274,7 +311,7 @@ struct page *obdfs_getpage(struct inode *inode, unsigned long offset, int create
        hash = page_hash(&inode->i_data, offset);
        page = grab_cache_page(&inode->i_data, offset);
 
        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)
        /* now check if the data in the page is up to date */
        if ( Page_Uptodate(page)) { 
                if (!locked)


@@ -285,12 +322,24 @@ struct page *obdfs_getpage(struct inode *inode, unsigned long offset, int create
 
        /* it's not: read it */
        if (! page) {
 
        /* 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;
                SetPageError(page);
                UnlockPage(page);
                return page;