From 8409b14651cf0d62b63112ee9e8fafa948d8776c Mon Sep 17 00:00:00 2001
From: qian <qian>
Date: Thu, 18 Oct 2007 01:18:16 +0000
Subject: [PATCH] b=13099 i=adilger,shadow fix directIO path.
---
lustre/llite/rw26.c | 67 +++++++++++++++++++++++++++++++++++----------
1 file changed, 52 insertions(+), 15 deletions(-)
diff --git a/lustre/llite/rw26.c b/lustre/llite/rw26.c
index d32a4472bb..5ea3a6c0e8 100644
--- a/lustre/llite/rw26.c
+++ b/lustre/llite/rw26.c
@@ -133,15 +133,14 @@ static void ll_free_user_pages(struct page **pages, int npages, int do_dirty)
static ssize_t ll_direct_IO_26_seg(int rw, struct inode *inode,
struct address_space *mapping,
- struct lov_stripe_md *lsm,
+ struct obd_info *oinfo,
+ struct ptlrpc_request_set *set,
size_t size, loff_t file_offset,
struct page **pages, int page_count)
{
struct brw_page *pga;
- struct obdo oa;
int i, rc = 0;
size_t length;
- loff_t file_offset_orig = file_offset;
ENTRY;
OBD_ALLOC(pga, sizeof(*pga) * page_count);
@@ -163,15 +162,11 @@ static ssize_t ll_direct_IO_26_seg(int rw, struct inode *inode,
POISON_PAGE(pages[i], 0x0d);
}
- ll_inode_fill_obdo(inode, rw, &oa);
-
- rc = obd_brw_rqset(rw == WRITE ? OBD_BRW_WRITE : OBD_BRW_READ,
- ll_i2obdexp(inode), &oa, lsm, page_count, pga, NULL);
- if ((rc > 0) && (rw == WRITE)) {
- lov_stripe_lock(lsm);
- obd_adjust_kms(ll_i2obdexp(inode), lsm, file_offset_orig + rc, 0);
- lov_stripe_unlock(lsm);
- }
+ rc = obd_brw_async(rw == WRITE ? OBD_BRW_WRITE : OBD_BRW_READ,
+ ll_i2obdexp(inode), oinfo, page_count,
+ pga, NULL, set);
+ if (rc == 0)
+ rc = size;
OBD_FREE(pga, sizeof(*pga) * page_count);
RETURN(rc);
@@ -191,6 +186,10 @@ static ssize_t ll_direct_IO_26(int rw, struct kiocb *iocb,
struct inode *inode = file->f_mapping->host;
ssize_t count = iov_length(iov, nr_segs), tot_bytes = 0;
struct ll_inode_info *lli = ll_i2info(inode);
+ struct lov_stripe_md *lsm = lli->lli_smd;
+ struct ptlrpc_request_set *set;
+ struct obd_info oinfo;
+ struct obdo oa;
unsigned long seg;
size_t size = MAX_DIO_SIZE;
ENTRY;
@@ -220,10 +219,30 @@ static ssize_t ll_direct_IO_26(int rw, struct kiocb *iocb,
RETURN(-EINVAL);
}
+ set = ptlrpc_prep_set();
+ if (set == NULL)
+ RETURN(-ENOMEM);
+
+ ll_inode_fill_obdo(inode, rw, &oa);
+ oinfo.oi_oa = &oa;
+ oinfo.oi_md = lsm;
+
+ /* need locking between buffered and direct access. and race with
+ *size changing by concurrent truncates and writes. */
+ if (rw == READ)
+ LOCK_INODE_MUTEX(inode);
+
for (seg = 0; seg < nr_segs; seg++) {
size_t iov_left = iov[seg].iov_len;
unsigned long user_addr = (unsigned long)iov[seg].iov_base;
+ if (rw == READ) {
+ if (file_offset >= inode->i_size)
+ break;
+ if (file_offset + iov_left > inode->i_size)
+ iov_left = inode->i_size - file_offset;
+ }
+
while (iov_left > 0) {
struct page **pages;
int page_count;
@@ -236,7 +255,7 @@ static ssize_t ll_direct_IO_26(int rw, struct kiocb *iocb,
if (page_count > 0) {
result = ll_direct_IO_26_seg(rw, inode,
file->f_mapping,
- lli->lli_smd,
+ &oinfo, set,
min(size,iov_left),
file_offset, pages,
page_count);
@@ -261,8 +280,8 @@ static ssize_t ll_direct_IO_26(int rw, struct kiocb *iocb,
continue;
}
if (tot_bytes > 0)
- RETURN(tot_bytes);
- RETURN(page_count < 0 ? page_count : result);
+ GOTO(wait_io, tot_bytes);
+ GOTO(out, tot_bytes = page_count < 0 ? page_count : result);
}
tot_bytes += result;
@@ -271,6 +290,24 @@ static ssize_t ll_direct_IO_26(int rw, struct kiocb *iocb,
user_addr += result;
}
}
+
+ if (tot_bytes > 0) {
+ int rc;
+ wait_io:
+ rc = ptlrpc_set_wait(set);
+ if (rc)
+ GOTO(out, tot_bytes = rc);
+ if (rw == WRITE) {
+ lov_stripe_lock(lsm);
+ obd_adjust_kms(ll_i2obdexp(inode), lsm, file_offset, 0);
+ lov_stripe_unlock(lsm);
+ }
+ }
+out:
+ if (rw == READ)
+ UNLOCK_INODE_MUTEX(inode);
+
+ ptlrpc_set_destroy(set);
RETURN(tot_bytes);
}
--
GitLab