oa->o_valid = (__u32)OBD_MD_FLNOTOBD;
obdfs_from_inode(oa, inode);
- err = obd_brw(rw, IID(inode), num_obdo, &oa, &bufs_per_obdo,
- &page, &count, &offset, &flags, NULL);
+ err = obd_brw(rw == WRITE ? OBD_BRW_WRITE : OBD_BRW_READ, IID(inode),
+ num_obdo, &oa, &bufs_per_obdo, &page, &count, &offset,
+ &flags, NULL);
//if ( !err )
// obdfs_to_inode(inode, oa); /* copy o_blocks to i_blocks */
CDEBUG(D_INODE, "commit_page writing (at %d) to %d, count %Ld\n",
from, to, (unsigned long long)count);
- err = obd_brw(WRITE, IID(inode), num_obdo, &oa, &bufs_per_obdo,
- &page, &count, &offset, &flags, NULL);
+ err = obd_brw(OBD_BRW_WRITE, IID(inode), num_obdo, &oa, &bufs_per_obdo,
+ &page, &count, &offset, &flags, NULL);
if ( !err ) {
SetPageUptodate(page);
set_page_clean(page);
goto readpage_out;
}
- rc = obdfs_brw(READ, inode, page, 0);
+ rc = obdfs_brw(OBD_BRW_READ, inode, page, 0);
if ( rc ) {
EXIT;
return rc;
EXIT;
return 0;
}
-
- rc = obdfs_brw(READ, inode, page, 0);
+
+ rc = obdfs_brw(OBD_BRW_READ, inode, page, 0);
if ( !rc ) {
SetPageUptodate(page);
- }
+ }
prepare_done:
set_page_dirty(page);
CDEBUG(D_INFO, "BRW done\n");
/* release the pages from the page cache */
- while ( num_io > 0 ) {
- --num_io;
+ while (num_io-- > 0) {
CDEBUG(D_INFO, "calling put_page for %p, index %ld\n",
pages[num_io], pages[num_io]->index);
put_page(pages[num_io]);
}
CDEBUG(D_INFO, "put_page done\n");
- while ( num_obdos > 0) {
- --num_obdos;
+ while (num_obdos-- > 0) {
CDEBUG(D_INFO, "free obdo %ld\n",(long)obdos[num_obdos]->o_id);
/* copy o_blocks to i_blocks */
obdfs_set_size (inodes[num_obdos], obdos[num_obdos]->o_size);
/* We check for complete page writes here, as we then don't have to
* get the page before writing over everything anyways.
*/
- if ( !Page_Uptodate(page) && (offset != 0 || bytes != PAGE_SIZE) ) {
- err = obdfs_brw(READ, inode, page, 0);
+ if (!Page_Uptodate(page) && (offset != 0 || bytes != PAGE_SIZE)) {
+ err = obdfs_brw(OBD_BRW_READ, inode, page, 0);
if ( err )
return err;
SetPageUptodate(page);
}
EXIT;
return page;
- }
+ }
- err = obdfs_brw(READ, inode, page, create);
+ err = obdfs_brw(OBD_BRW_READ, inode, page, create);
if ( err ) {
SetPageError(page);