From 52bba4abb7102e93d03accd75515736ad11be57d Mon Sep 17 00:00:00 2001 From: Christoph Hellwig Date: Wed, 21 Sep 2005 09:55:33 -0700 Subject: [PATCH] --- yaml --- r: 9147 b: refs/heads/master c: bbcc6bee9e5bf45ec35e87a4e0755dff09fe25d4 h: refs/heads/master i: 9145: a1911d255456e503108ddfe51f876f3364ad8308 9143: 2161bd10fdfb65019779762ff2005231ff466658 v: v3 --- [refs] | 2 +- trunk/drivers/block/ll_rw_blk.c | 38 --------------------------------- 2 files changed, 1 insertion(+), 39 deletions(-) diff --git a/[refs] b/[refs] index 5b63f63c6e11..04699872c36e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1bc2a3bb86688ffca691ba2ad30a2d5dcba774cf +refs/heads/master: bbcc6bee9e5bf45ec35e87a4e0755dff09fe25d4 diff --git a/trunk/drivers/block/ll_rw_blk.c b/trunk/drivers/block/ll_rw_blk.c index 483d71b10cf9..baedac522945 100644 --- a/trunk/drivers/block/ll_rw_blk.c +++ b/trunk/drivers/block/ll_rw_blk.c @@ -2373,44 +2373,6 @@ int blkdev_issue_flush(struct block_device *bdev, sector_t *error_sector) 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 |= REQ_BLOCK_PC | REQ_SOFTBARRIER; - rq->sector = 0; - memset(rq->cmd, 0, sizeof(rq->cmd)); - rq->cmd[0] = 0x35; - rq->cmd_len = 12; - rq->data = NULL; - rq->data_len = 0; - rq->timeout = 60 * HZ; - - ret = blk_execute_rq(q, disk, rq, 0); - - if (ret && error_sector) - *error_sector = rq->sector; - - blk_put_request(rq); - return ret; -} - -EXPORT_SYMBOL(blkdev_scsi_issue_flush_fn); - static void drive_stat_acct(struct request *rq, int nr_sectors, int new_io) { int rw = rq_data_dir(rq);