Skip to contentSkip to conversation

Enhanced partition statistics: cciss fix

PATCH In review Jerome Marchand 3 participants 3 messages Dec 13, 2007 Block layer

lore
Share & tools
lore

Jerome Marchand

author
#0 lore raw

PATCH 4/8 Enhanced partition statistics: cciss fix

Updates the enhanced partition statistics in cciss driver.

Signed-off-by Jerome Marchand <[email protected]>
---
 cciss.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/block/cciss.c +2 -1
diff -urNp -X linux-2.6/Documentation/dontdiff linux-2.6.orig/drivers/block/cciss.c linux-2.6/drivers/block/cciss.c
@@ -1268,7 +1268,8 @@ static void cciss_softirq_done(struct re
 	if (blk_fs_request(rq)) {
 		const int rw = rq_data_dir(rq);
 
-		disk_stat_add(rq->rq_disk, sectors[rw], rq->nr_sectors);
+		all_stat_add(rq->rq_disk, sectors[rw],
+			     rq->nr_sectors, rq->sector);
 	}
 
 #ifdef CCISS_DEBUG
#1 lore raw
Quoted 14 lines

Updates the enhanced partition statistics in cciss driver.

Signed-off-by Jerome Marchand <[email protected]>
---
 cciss.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-) diff -urNp -X

linux-2.6/Documentation/dontdiff linux-2.6.orig/drivers/block/cciss.c linux-2.6/drivers/block/cciss.c
--- linux-2.6.orig/drivers/block/cciss.c 2007-12-04
17:37:13.000000000 +0100
+++ linux-2.6/drivers/block/cciss.c 2007-12-05
13:46:29.000000000 +0100

drivers/block/cciss.c static void cciss_softirq_done(struct re · line 1274

Quoted 8 lines
drivers/block/cciss.c +2 -1
@@ -1268,7 +1268,8 @@ static void cciss_softirq_done(struct re
        if (blk_fs_request(rq)) {
                const int rw = rq_data_dir(rq);
 
-               disk_stat_add(rq->rq_disk, sectors[rw],
 rq->nr_sectors);
+               all_stat_add(rq->rq_disk, sectors[rw],
+                            rq->nr_sectors, rq->sector);
        }

How does this mesh with the changes submitted by Kiyoshi Ueda? Any conflicts?

-- mikem

#2 lore raw

Hi,

Thank you for noticing this, Mike.

Quoted 16 lines · Mike
Quoted 16 lines

Updates the enhanced partition statistics in cciss driver.

Signed-off-by Jerome Marchand <[email protected]>
---
 cciss.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-) diff -urNp -X

linux-2.6/Documentation/dontdiff linux-2.6.orig/drivers/block/cciss.c linux-2.6/drivers/block/cciss.c
--- linux-2.6.orig/drivers/block/cciss.c 2007-12-04
17:37:13.000000000 +0100
+++ linux-2.6/drivers/block/cciss.c 2007-12-05
13:46:29.000000000 +0100

drivers/block/cciss.c +0 -0
@@ -1268,7 +1268,8 @@ static void cciss_softirq_done(struct re
        if (blk_fs_request(rq)) {
                const int rw = rq_data_dir(rq);
Quoted 7 lines

drivers/block/cciss.c static void cciss_softirq_done(struct re · line 1273

Quoted 5 lines
drivers/block/cciss.c +2 -1
-               disk_stat_add(rq->rq_disk, sectors[rw],
 rq->nr_sectors);
+               all_stat_add(rq->rq_disk, sectors[rw],
+                            rq->nr_sectors, rq->sector);
        }

How does this mesh with the changes submitted by Kiyoshi Ueda? Any conflicts?

I think no conflict with my patch technically.

Jerome's patch changes __end_that_request_first(), too, as same as the change above.
And my patch changes cciss/cpqarray to use blk_end_request, which uses __end_that_request_first() internally, instead of doing disk_stat_add() by themselves.
(http://marc.info/?l=linux-kernel&m=119741542206258&w=2)

So Jerome can just drop the cciss/cpqarray changes from his patch-set, if my patch-set is merged.

Quoted 1 line

-- mikem

Thanks,
Kiyoshi Ueda