b=11737/12549

The 11737 patch causes various kernel crashes; see bug 12549.
Verified by nathan and adilger.
Reverting.

diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index b103215..ba4bb86 100644 (file)
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -164,13 +164,6 @@ Details    : size of struct ll_inode_info is to big for union inode.u and this
              can be cause of random memory corruption.
 
 Severity   : normal
-Bugzilla   : 11737
-Description: Short directio read returns full requested size rather than
-             actual amount read.
-Details    : Direct I/O operations should return actual amount of bytes
-             transferred rather than requested size.
-
-Severity   : normal
 Frequency  : rare 
 Bugzilla   : 10818
 Description: Memory leak in recovery

diff --git a/lustre/include/lustre_net.h b/lustre/include/lustre_net.h
index fc731cb..e6e7d21 100644 (file)
--- a/lustre/include/lustre_net.h
+++ b/lustre/include/lustre_net.h
@@ -181,8 +181,6 @@ struct ptlrpc_request_set {
         struct list_head  set_requests;
         set_interpreter_func    set_interpret; /* completion callback */
         void              *set_arg; /* completion context */
-        void              *set_countp; /* pointer to NOB counter in case 
-                                        * of directIO (bug11737) */
         /* locked so that any old caller can communicate requests to
          * the set holder who can then fold them into the lock-free set */
         spinlock_t        set_new_req_lock;

diff --git a/lustre/include/obd_class.h b/lustre/include/obd_class.h
index f77c399..d796405 100644 (file)
--- a/lustre/include/obd_class.h
+++ b/lustre/include/obd_class.h
@@ -911,15 +911,12 @@ static inline int obd_brw_rqset(int cmd, struct obd_export *exp,
 {
         struct ptlrpc_request_set *set = NULL;
         struct obd_info oinfo = { { { 0 } } };
-        atomic_t nob;
         int rc = 0;
         ENTRY;
 
         set =  ptlrpc_prep_set();
         if (set == NULL)
                 RETURN(-ENOMEM);
-        atomic_set(&nob, 0);
-        set->set_countp = &nob;
 
         oinfo.oi_oa = oa;
         oinfo.oi_md = lsm;
@@ -928,8 +925,6 @@ static inline int obd_brw_rqset(int cmd, struct obd_export *exp,
                 rc = ptlrpc_set_wait(set);
                 if (rc)
                         CERROR("error from callback: rc = %d\n", rc);
-                else
-                        rc = atomic_read(&nob);
         } else {
                 CDEBUG(rc == -ENOSPC ? D_INODE : D_ERROR,
                        "error from obd_brw_async: rc = %d\n", rc);

diff --git a/lustre/llite/rw24.c b/lustre/llite/rw24.c
index 646dedc..508636b 100644 (file)
--- a/lustre/llite/rw24.c
+++ b/lustre/llite/rw24.c
@@ -66,14 +66,13 @@ static int ll_direct_IO_24(int rw,
         struct brw_page *pga;
         struct obdo oa;
         int length, i, flags, rc = 0;
-        loff_t offset, offset_orig;
+        loff_t offset;
         ENTRY;
 
         if (!lsm || !lsm->lsm_object_id)
                 RETURN(-EBADF);
 
         offset = ((obd_off)blocknr << inode->i_blkbits);
-        offset_orig = offset;
         CDEBUG(D_VFSTRACE, "VFS Op:inode=%lu/%u(%p), size="LPSZ
                ", offset=%lld=%llx, pages %u\n",
                inode->i_ino, inode->i_generation, inode, iobuf->length,
@@ -114,10 +113,13 @@ static int ll_direct_IO_24(int rw,
                                     LPROC_LL_DIRECT_READ, iobuf->length);
         rc = obd_brw_rqset(rw, ll_i2obdexp(inode), &oa, lsm, iobuf->nr_pages,
                            pga, NULL);
-        if ((rc > 0) && (rw == OBD_BRW_WRITE)) {
-                lov_stripe_lock(lsm);
-                obd_adjust_kms(ll_i2obdexp(inode), lsm, offset_orig + rc, 0);
-                lov_stripe_unlock(lsm);
+        if (rc == 0) {
+                rc = iobuf->length;
+                if (rw == OBD_BRW_WRITE) {
+                        lov_stripe_lock(lsm);
+                        obd_adjust_kms(ll_i2obdexp(inode), lsm, offset, 0);
+                        lov_stripe_unlock(lsm);
+                }
         }
 
         OBD_FREE(pga, sizeof(*pga) * iobuf->nr_pages);

diff --git a/lustre/llite/rw26.c b/lustre/llite/rw26.c
index eac8c84..4fb767f 100644 (file)
--- a/lustre/llite/rw26.c
+++ b/lustre/llite/rw26.c
@@ -141,7 +141,6 @@ static ssize_t ll_direct_IO_26_seg(int rw, struct inode *inode,
         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);
@@ -167,10 +166,13 @@ static ssize_t ll_direct_IO_26_seg(int rw, struct inode *inode,
 
         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);
+        if (rc == 0) {
+                rc = size;
+                if (rw == WRITE) {
+                        lov_stripe_lock(lsm);
+                        obd_adjust_kms(ll_i2obdexp(inode), lsm, file_offset, 0);
+                        lov_stripe_unlock(lsm);
+                }
         }
 
         OBD_FREE(pga, sizeof(*pga) * page_count);

diff --git a/lustre/osc/osc_request.c b/lustre/osc/osc_request.c
index 31e7e39..3d2a6eb 100644 (file)
--- a/lustre/osc/osc_request.c
+++ b/lustre/osc/osc_request.c
@@ -1086,9 +1086,6 @@ static int osc_brw_fini_request(struct ptlrpc_request *req, int rc)
         if (rc < 0)
                 RETURN(rc);
 
-        if (req->rq_set && req->rq_set->set_countp)
-                atomic_add(rc, (atomic_t *)req->rq_set->set_countp);
-
         if (unlikely(aa->aa_oa->o_valid & OBD_MD_FLCKSUM))
                 client_cksum = aa->aa_oa->o_cksum; /* save for later */
 

diff --git a/lustre/tests/directio.c b/lustre/tests/directio.c
index ebcedb2..b68bd74 100644 (file)
--- a/lustre/tests/directio.c
+++ b/lustre/tests/directio.c
@@ -106,7 +106,7 @@ int main(int argc, char **argv)
 
                 rc = read(fd, rbuf, len);
                 if (rc != len) {
-                        printf("Read error: %s rc = %d\n",strerror(errno),rc);
+                        printf("Read error: %s (rc = %d)\n",strerror(errno),rc);
                         return 1;
                 }
 

diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh
index 759e7cb..0d71a90 100644 (file)
--- a/lustre/tests/sanity.sh
+++ b/lustre/tests/sanity.sh
@@ -3796,20 +3796,6 @@ test_118() #bug 11710
 }
 run_test 118 "verify O_SYNC work"
 
-test_119() # bug 11737
-{
-        dd if=/dev/zero of=$DIR/$tfile bs=4k count=2
-        sync
-        # we ask to read 3 blocks -- more than a file size
-        NOB=`directio read $DIR/$tfile 0 3 | awk '/error/ {print $6}'`
-        # check if we have read num of bytes not equal to file size (8k)
-        if [ "$NOB" != "8192" ]; then
-                error "read $NOB bytes instead of 8192"
-        fi
-        rm -f $DIR/$tfile
-}
-run_test 119 "Short directIO read must return actual read amount"
-
 TMPDIR=$OLDTMPDIR
 TMP=$OLDTMP
 HOME=$OLDHOME