drivers/block/ll_rw_blk.c: possible cleanups

PATCH In review Adrian Bunk 2 participants 6 messages Apr 10, 2005 – Apr 12, 2005 Block layer

Share & tools

Adrian Bunk

author

2005-04-10 18:17 UTC #0 lore raw

PATCH 1/1 drivers/block/ll_rw_blk.c: possible cleanups

This patch contains the following possible cleanups:
- make needlessly global code static
- remove the following unused global functions:
- blkdev_scsi_issue_flush_fn
- __blk_attempt_remerge
- remove the following unused EXPORT_SYMBOL's:
- blk_phys_contig_segment
- blk_hw_contig_segment
- blkdev_scsi_issue_flush_fn
- __blk_attempt_remerge

Please review which of these changes make sense.

Signed-off-by Adrian Bunk <[email protected]>

---

 drivers/block/ll_rw_blk.c |   67 ++++----------------------------------
 include/linux/blkdev.h    |    6 ---
 2 files changed, 8 insertions(+), 65 deletions(-)

include/linux/blkdev.h renamed from include/linux/blkdev.h.old +0 -6

@@ -548,15 +548,12 @@
 extern void blk_put_request(struct request *);
 extern void blk_end_sync_rq(struct request *rq);
 extern void blk_attempt_remerge(request_queue_t *, struct request *);
-extern void __blk_attempt_remerge(request_queue_t *, struct request *);
 extern struct request *blk_get_request(request_queue_t *, int, int);
 extern void blk_insert_request(request_queue_t *, struct request *, int, void *, int);
 extern void blk_requeue_request(request_queue_t *, struct request *);
 extern void blk_plug_device(request_queue_t *);
 extern int blk_remove_plug(request_queue_t *);
 extern void blk_recount_segments(request_queue_t *, struct bio *);
-extern int blk_phys_contig_segment(request_queue_t *q, struct bio *, struct bio *);
-extern int blk_hw_contig_segment(request_queue_t *q, struct bio *, struct bio *);
 extern int scsi_cmd_ioctl(struct file *, struct gendisk *, unsigned int, void __user *);
 extern void blk_start_queue(request_queue_t *q);
 extern void blk_stop_queue(request_queue_t *q);

@@ -638,7 +635,6 @@
 extern struct backing_dev_info *blk_get_backing_dev_info(struct block_device *bdev);
 extern void blk_queue_ordered(request_queue_t *, int);
 extern void blk_queue_issue_flush_fn(request_queue_t *, issue_flush_fn *);
-extern int blkdev_scsi_issue_flush_fn(request_queue_t *, struct gendisk *, sector_t *);
 extern struct request *blk_start_pre_flush(request_queue_t *,struct request *);
 extern int blk_complete_barrier_rq(request_queue_t *, struct request *, int);
 extern int blk_complete_barrier_rq_locked(request_queue_t *, struct request *, int);

@@ -681,8 +677,6 @@
 
 #define blkdev_entry_to_request(entry) list_entry((entry), struct request, queuelist)
 
-extern void drive_stat_acct(struct request *, int, int);
-
 static inline int queue_hardsect_size(request_queue_t *q)
 {
 	int retval = 512;

drivers/block/ll_rw_blk.c renamed from drivers/block/ll_rw_blk.c.old +8 ~~-59~~

127 lines not on this page · raw message

Jens Axboe

2005-04-11 06:15 UTC #1 lore raw

Quoted 4 lines · Adrian Bunk

This patch contains the following possible cleanups:
- make needlessly global code static
- remove the following unused global functions:
- blkdev_scsi_issue_flush_fn

Kill the function completely, it is not used anymore.

Quoted 1 line

- __blk_attempt_remerge

Normally I would say leave that since it's part of the API, but lets just kill it. I don't envision any further users of the remerging attempts.

Quoted 7 lines

- remove the following unused EXPORT_SYMBOL's:
- blk_phys_contig_segment
- blk_hw_contig_segment
- blkdev_scsi_issue_flush_fn
- __blk_attempt_remerge
Please review which of these changes make sense.

Looks fine to me, thanks. Can you send a new patch that kills blkdev_scsi_issue_flush_fn()?

Signature · 1 line

Jens Axboe

Adrian Bunk

author

2005-04-12 02:04 UTC #2 lore raw

Quoted 20 lines · Jens Axboe

Quoted 4 lines · Adrian Bunk
This patch contains the following possible cleanups:
- make needlessly global code static
- remove the following unused global functions:
- blkdev_scsi_issue_flush_fn
Kill the function completely, it is not used anymore.
Quoted 1 line
- __blk_attempt_remerge
Normally I would say leave that since it's part of the API, but lets just kill it. I don't envision any further users of the remerging attempts.
Quoted 6 lines
- remove the following unused EXPORT_SYMBOL's:
- blk_phys_contig_segment
- blk_hw_contig_segment
- blkdev_scsi_issue_flush_fn
- __blk_attempt_remerge

Quoted 4 lines

Quoted 1 line
Please review which of these changes make sense.
Looks fine to me, thanks. Can you send a new patch that kills blkdev_scsi_issue_flush_fn()?

I have a problem parsing your email.

Which parts of my patch are OK and which shouldn't be applied? Or why do you want a separate blkdev_scsi_issue_flush_fn patch?

Quoted 1 line

Jens Axboe

cu
Adrian

Signature · 4 lines

       "Is there not promise of rain?" Ling Tan asked suddenly out
        of the darkness. There had been need of rain for many days.
       "Only a promise," Lao Er said.
                                       Pearl S. Buck - Dragon Seed

Jens Axboe

2005-04-12 05:59 UTC #3 lore raw

Quoted 23 lines · Adrian Bunk

Quoted 22 lines · Jens Axboe
Quoted 4 lines · Adrian Bunk
This patch contains the following possible cleanups:
- make needlessly global code static
- remove the following unused global functions:
- blkdev_scsi_issue_flush_fn
Kill the function completely, it is not used anymore.
Quoted 1 line
- __blk_attempt_remerge
Normally I would say leave that since it's part of the API, but lets just kill it. I don't envision any further users of the remerging attempts.
Quoted 7 lines
- remove the following unused EXPORT_SYMBOL's:
- blk_phys_contig_segment
- blk_hw_contig_segment
- blkdev_scsi_issue_flush_fn
- __blk_attempt_remerge
Please review which of these changes make sense.

Quoted 7 lines

Quoted 2 lines
Looks fine to me, thanks. Can you send a new patch that kills blkdev_scsi_issue_flush_fn()?
I have a problem parsing your email.
Which parts of my patch are OK and which shouldn't be applied? Or why do you want a separate blkdev_scsi_issue_flush_fn patch?

I have no problems with your patch, I would just like a revised patch that removes blkdev_scsi_issue_flush_fn completely instead since it is totally unused. It doesn't make sense to remove the export and make it static, since it isn't used internally (and never meant to, it's a helper function for drivers).

Signature · 1 line

Jens Axboe

Adrian Bunk

author

2005-04-12 11:54 UTC #4 lore raw

Quoted 29 lines · Jens Axboe

Quoted 28 lines · Adrian Bunk
Quoted 20 lines · Jens Axboe
Quoted 4 lines · Adrian Bunk
This patch contains the following possible cleanups:
- make needlessly global code static
- remove the following unused global functions:
- blkdev_scsi_issue_flush_fn
Kill the function completely, it is not used anymore.
Quoted 1 line
- __blk_attempt_remerge
Normally I would say leave that since it's part of the API, but lets just kill it. I don't envision any further users of the remerging attempts.
Quoted 6 lines
- remove the following unused EXPORT_SYMBOL's:
- blk_phys_contig_segment
- blk_hw_contig_segment
- blkdev_scsi_issue_flush_fn
- __blk_attempt_remerge
Quoted 4 lines
Quoted 1 line
Please review which of these changes make sense.
Looks fine to me, thanks. Can you send a new patch that kills blkdev_scsi_issue_flush_fn()?
I have a problem parsing your email.

Quoted 8 lines

Quoted 2 lines
Which parts of my patch are OK and which shouldn't be applied? Or why do you want a separate blkdev_scsi_issue_flush_fn patch?
I have no problems with your patch, I would just like a revised patch that removes blkdev_scsi_issue_flush_fn completely instead since it is totally unused. It doesn't make sense to remove the export and make it static, since it isn't used internally (and never meant to, it's a helper function for drivers).

My patch does already completely remove blkdev_scsi_issue_flush_fn.

When I say "remove the following unused global functions:", this means the patch completely removes the function.

Quoted 1 line

Jens Axboe

cu
Adrian

Signature · 4 lines

       "Is there not promise of rain?" Ling Tan asked suddenly out
        of the darkness. There had been need of rain for many days.
       "Only a promise," Lao Er said.
                                       Pearl S. Buck - Dragon Seed

Jens Axboe

2005-04-12 12:10 UTC #5 lore raw

Quoted 39 lines · Adrian Bunk

Quoted 29 lines · Jens Axboe
Quoted 28 lines · Adrian Bunk
Quoted 20 lines · Jens Axboe
Quoted 4 lines · Adrian Bunk
This patch contains the following possible cleanups:
- make needlessly global code static
- remove the following unused global functions:
- blkdev_scsi_issue_flush_fn
Kill the function completely, it is not used anymore.
Quoted 1 line
- __blk_attempt_remerge
Normally I would say leave that since it's part of the API, but lets just kill it. I don't envision any further users of the remerging attempts.
Quoted 6 lines
- remove the following unused EXPORT_SYMBOL's:
- blk_phys_contig_segment
- blk_hw_contig_segment
- blkdev_scsi_issue_flush_fn
- __blk_attempt_remerge
Quoted 4 lines
Quoted 1 line
Please review which of these changes make sense.
Looks fine to me, thanks. Can you send a new patch that kills blkdev_scsi_issue_flush_fn()?
I have a problem parsing your email.
Quoted 8 lines
Quoted 2 lines
Which parts of my patch are OK and which shouldn't be applied? Or why do you want a separate blkdev_scsi_issue_flush_fn patch?
I have no problems with your patch, I would just like a revised patch that removes blkdev_scsi_issue_flush_fn completely instead since it is totally unused. It doesn't make sense to remove the export and make it static, since it isn't used internally (and never meant to, it's a helper function for drivers).

Quoted 4 lines

My patch does already completely remove blkdev_scsi_issue_flush_fn.
When I say "remove the following unused global functions:", this means the patch completely removes the function.

Ah, I misread that, missed it in the patch as well apparently. Then I'm fine with the patch.

Signature · 1 line

Jens Axboe