From 5ae81c4eddfb99948855e89d1515d03a9a0ecf5b Mon Sep 17 00:00:00 2001 From: "K. Y. Srinivasan" Date: Tue, 10 May 2011 07:54:25 -0700 Subject: [PATCH] --- yaml --- r: 249481 b: refs/heads/master c: 5b60aceedc7b1378f8f979722f7dd15b06d29ecf h: refs/heads/master i: 249479: f1d4179144a2ded0c09b5bdea6c94f42b073d85a v: v3 --- [refs] | 2 +- trunk/drivers/staging/hv/storvsc_drv.c | 24 ++++++++++-------------- 2 files changed, 11 insertions(+), 15 deletions(-) diff --git a/[refs] b/[refs] index 46cc838958a0..e8381850c46e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f8feed068532b28f7391b93799d00a7f3eb6f922 +refs/heads/master: 5b60aceedc7b1378f8f979722f7dd15b06d29ecf diff --git a/trunk/drivers/staging/hv/storvsc_drv.c b/trunk/drivers/staging/hv/storvsc_drv.c index 52d897434d1d..2bd9c098ecb3 100644 --- a/trunk/drivers/staging/hv/storvsc_drv.c +++ b/trunk/drivers/staging/hv/storvsc_drv.c @@ -112,10 +112,19 @@ static int stor_vsc_initialize(struct hv_driver *driver) return 0; } +static int storvsc_device_alloc(struct scsi_device *sdevice) +{ + /* + * This enables luns to be located sparsely. Otherwise, we may not + * discovered them. + */ + sdevice->sdev_bflags |= BLIST_SPARSELUN | BLIST_LARGELUN; + return 0; +} + /* Static decl */ static int storvsc_probe(struct hv_device *dev); static int storvsc_queuecommand(struct Scsi_Host *shost, struct scsi_cmnd *scmnd); -static int storvsc_device_alloc(struct scsi_device *); static int storvsc_device_configure(struct scsi_device *); static int storvsc_host_reset_handler(struct scsi_cmnd *scmnd); static int storvsc_remove(struct hv_device *dev); @@ -821,19 +830,6 @@ static int storvsc_merge_bvec(struct request_queue *q, return bvec->bv_len; } -/* - * storvsc_device_configure - Configure the specified scsi device - */ -static int storvsc_device_alloc(struct scsi_device *sdevice) -{ - /* - * This enables luns to be located sparsely. Otherwise, we may not - * discovered them. - */ - sdevice->sdev_bflags |= BLIST_SPARSELUN | BLIST_LARGELUN; - return 0; -} - static int storvsc_device_configure(struct scsi_device *sdevice) { scsi_adjust_queue_depth(sdevice, MSG_SIMPLE_TAG,