#include <linux/lustre_fsfilt.h>
#include "filter_internal.h"
-#warning "implement writeback mode -bzzz"
-
/* 512byte block min */
#define MAX_BLOCKS_PER_PAGE (PAGE_SIZE / 512)
struct dio_request {
rc = dreq->dr_error;
RETURN(rc);
}
-
+
/* These are our hacks to keep our directio/bh IO coherent with ext3's
* page cache use. Most notably ext3 reads file data into the page
* cache when it is zeroing the tail of partial-block truncates and
rc2 = filter_finish_transno(exp, oti, 0);
if (rc2 != 0)
CERROR("can't close transaction: %d\n", rc);
+ rc = (rc == 0) ? rc2 : rc;
+
+ rc2 = fsfilt_commit_async(obd,inode,oti->oti_handle,wait_handle);
+ rc = (rc == 0) ? rc2 : rc;
- if (rc == 0)
- rc = rc2;
if (rc != 0)
RETURN(rc);
}
unsigned long now = jiffies;
int i, err, cleanup_phase = 0;
struct obd_device *obd = exp->exp_obd;
+ void *wait_handle = NULL;
int total_size = 0;
loff_t old_size;
ENTRY;
iattr_from_obdo(&iattr,oa,OBD_MD_FLATIME|OBD_MD_FLMTIME|OBD_MD_FLCTIME);
/* filter_direct_io drops i_sem */
rc = filter_direct_io(OBD_BRW_WRITE, res->dentry, dreq, exp, &iattr,
- oti, NULL);
+ oti, &wait_handle);
#if 0
if (inode->i_size != old_size) {
fsfilt_check_slow(now, obd_timeout, "direct_io");
- err = fsfilt_commit(obd, obd->u.filter.fo_sb, inode, oti->oti_handle,
- obd_sync_filter);
- if (err)
+ err = fsfilt_commit_wait(obd, inode, wait_handle);
+ if (rc == 0)
rc = err;
-
- if (obd_sync_filter && !err)
- LASSERTF(oti->oti_transno <= obd->obd_last_committed,
- "oti_transno "LPU64" last_committed "LPU64"\n",
- oti->oti_transno, obd->obd_last_committed);
-
+
fsfilt_check_slow(now, obd_timeout, "commitrw commit");
cleanup: