Whamcloud - gitweb
- disable debug
[fs/lustre-release.git] / lustre / obdfilter / filter_io_26.c
index 7b86092..ad109e4 100644 (file)
@@ -369,7 +369,7 @@ int filter_direct_io(int rw, struct dentry *dchild, void *iobuf,
         
         if (rw == OBD_BRW_WRITE) {
                 create = 1;
-                sem = &obd->u.filter.fo_alloc_lock;
+                //sem = &obd->u.filter.fo_alloc_lock;
         }
 
         rc = fsfilt_map_inode_pages(obd, inode,
@@ -380,13 +380,10 @@ int filter_direct_io(int rw, struct dentry *dchild, void *iobuf,
 
         if (rw == OBD_BRW_WRITE) {
                 if (rc == 0) {
-#if 0
-                        filter_tally_write(&obd->u.filter, 
-                                           dreq->dr_pages,
-                                           dreq->dr_page_idx,
-                                           dreq->dr_blocks,
+                        int blocks_per_page = PAGE_SIZE >> inode->i_blkbits;
+                        filter_tally_write(&obd->u.filter,  dreq->dr_pages,
+                                           dreq->dr_npages, dreq->dr_blocks,
                                            blocks_per_page);
-#endif
                         if (attr->ia_size > inode->i_size)
                                 attr->ia_valid |= ATTR_SIZE;
                         rc = fsfilt_setattr(obd, dchild, 
@@ -540,7 +537,7 @@ int filter_commitrw_write(struct obd_export *exp, struct obdo *oa,
         err = fsfilt_commit_wait(obd, inode, wait_handle);
         if (rc == 0)
                 rc = err;
-   
+
         fsfilt_check_slow(now, obd_timeout, "commitrw commit");
 
 cleanup: