Re: [2.6 patch] drivers/block/ll_rw_blk.c: possible cleanups
On Tue, Apr 12 2005, Adrian Bunk wrote: > On Tue, Apr 12, 2005 at 07:49:57AM +0200, Jens Axboe wrote: > > On Tue, Apr 12 2005, Adrian Bunk wrote: > > > On Mon, Apr 11, 2005 at 08:12:34AM +0200, Jens Axboe wrote: > > > > On Sun, Apr 10 2005, Adrian Bunk wrote: > > > > > 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. > > > > > > > > > - __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. > > > > > > > > > - 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()? > > > > > > 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). > > 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. -- Jens Axboe - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [2.6 patch] drivers/block/ll_rw_blk.c: possible cleanups
On Tue, Apr 12, 2005 at 07:49:57AM +0200, Jens Axboe wrote: > On Tue, Apr 12 2005, Adrian Bunk wrote: > > On Mon, Apr 11, 2005 at 08:12:34AM +0200, Jens Axboe wrote: > > > On Sun, Apr 10 2005, Adrian Bunk wrote: > > > > 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. > > > > > > > - __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. > > > > > > > - 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()? > > > > 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). 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. > Jens Axboe cu Adrian -- "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 - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [2.6 patch] drivers/block/ll_rw_blk.c: possible cleanups
On Tue, Apr 12 2005, Adrian Bunk wrote: > On Mon, Apr 11, 2005 at 08:12:34AM +0200, Jens Axboe wrote: > > On Sun, Apr 10 2005, Adrian Bunk wrote: > > > 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. > > > > > - __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. > > > > > - 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()? > > 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). -- Jens Axboe - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [2.6 patch] drivers/block/ll_rw_blk.c: possible cleanups
On Mon, Apr 11, 2005 at 08:12:34AM +0200, Jens Axboe wrote: > On Sun, Apr 10 2005, Adrian Bunk wrote: > > 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. > > > - __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. > > > - 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()? 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? > Jens Axboe cu Adrian -- "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 - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [2.6 patch] drivers/block/ll_rw_blk.c: possible cleanups
On Sun, Apr 10 2005, Adrian Bunk wrote: > 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. > - __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. > - 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()? -- Jens Axboe - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[2.6 patch] 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(-)
--- linux-2.6.12-rc2-mm2-full/include/linux/blkdev.h.old2005-04-10
01:55:03.0 +0200
+++ linux-2.6.12-rc2-mm2-full/include/linux/blkdev.h2005-04-10
01:57:11.0 +0200
@@ -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;
--- linux-2.6.12-rc2-mm2-full/drivers/block/ll_rw_blk.c.old 2005-04-10
01:55:17.0 +0200
+++ linux-2.6.12-rc2-mm2-full/drivers/block/ll_rw_blk.c 2005-04-10
01:57:49.0 +0200
@@ -36,6 +36,7 @@
static void blk_unplug_work(void *data);
static void blk_unplug_timeout(unsigned long data);
+static void drive_stat_acct(struct request *rq, int nr_sectors, int new_io);
/*
* For the allocated request tables
@@ -1149,7 +1150,7 @@
}
-int blk_phys_contig_segment(request_queue_t *q, struct bio *bio,
+static int blk_phys_contig_segment(request_queue_t *q, struct bio *bio,
struct bio *nxt)
{
if (!(q->queue_flags & (1 << QUEUE_FLAG_CLUSTER)))
@@ -1170,9 +1171,7 @@
return 0;
}
-EXPORT_SYMBOL(blk_phys_contig_segment);
-
-int blk_hw_contig_segment(request_queue_t *q, struct bio *bio,
+static int blk_hw_contig_segment(request_queue_t *q, struct bio *bio,
struct bio *nxt)
{
if (unlikely(!bio_flagged(bio, BIO_SEG_VALID)))
@@ -1188,8 +1187,6 @@
return 1;
}
-EXPORT_SYMBOL(blk_hw_contig_segment);
-
/*
* map a request to scatterlist, return number of sg entries setup. Caller
* must make sure sg can hold rq->nr_phys_segments entries
@@ -1810,7 +1807,7 @@
* is the behaviour we want though - once it gets a wakeup it should be given
* a nice run.
*/
-void ioc_set_batching(request_queue_t *q, struct io_context *ioc)
+static void ioc_set_batching(request_queue_t *q, struct io_context *ioc)
{
if (!ioc || ioc_batching(q, ioc))
return;
@@ -2250,45 +2247,7 @@
EXPORT_SYMBOL(blkdev_issue_flush);
-/**
- * blkdev_scsi_issue_flush_fn - issue flush for SCSI devices
- * @q: device queue
- * @disk: gendisk
- * @error_sector: error offset
- *
- * Description:
- *Devices understanding the SCSI command set, can use this function as
- *a helper for issuing a cache flush. Note: driver is required to store
- *the error offset (in case of error flushing) in ->sector of struct
- *request.
- */
-int blkdev_scsi_issue_flush_fn(request_queue_t *q, struct gendisk *disk,
- sector_t *error_sector)
-{
- struct request *rq = blk_get_request(q, WRITE, __GFP_WAIT);
- int ret;
-
- rq->flags |=
