From: johann <johann>
Date: Tue, 5 May 2009 17:25:44 +0000 (+0000)
Subject: Branch b1_8
X-Git-Tag: v1_8_2_01~1^2~474
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=c417cdc910d121021a4768cbad5828dc073e3a4a;p=fs%2Flustre-release.git

Branch b1_8
b=18206
i=green
i=bzzz

Disable per-stripe locking for O_DIRECT.
---

diff --git a/lustre/llite/file.c b/lustre/llite/file.c
index cd7b876..e4e366a 100644
--- a/lustre/llite/file.c
+++ b/lustre/llite/file.c
@@ -1469,7 +1469,7 @@ static ssize_t ll_file_aio_read(struct kiocb *iocb, const struct iovec *iov,
         }
 
 repeat:
-        if (sbi->ll_max_rw_chunk != 0) {
+        if (sbi->ll_max_rw_chunk != 0 && !(file->f_flags & O_DIRECT)) {
                 /* first, let's know the end of the current stripe */
                 end = *ppos;
                 obd_extent_calc(sbi->ll_osc_exp, lsm, OBD_CALC_STRIPE_END,&end);
@@ -1730,7 +1730,7 @@ repeat:
                 lock_end = OBD_OBJECT_EOF;
                 iov_copy = (struct iovec *)iov;
                 nrsegs_copy = nr_segs;
-        } else if (sbi->ll_max_rw_chunk != 0) {
+        } else if (sbi->ll_max_rw_chunk != 0 && !(file->f_flags & O_DIRECT)) {
                 /* first, let's know the end of the current stripe */
                 end = *ppos;
                 obd_extent_calc(sbi->ll_osc_exp, lsm, OBD_CALC_STRIPE_END,