[KARMIC] lp#397906 fix blank cd-r not detected

[Tim Gardner]

Manoj Iyer wrote:
> This also fixes a issue I had where I was not able to eject a blank DVD. I 
> tested the patch and it works.
> 
> The following changes since commit 
> afce3d59745491ccbc29cdbcac0eaaa41c3a83dd:
>    Tim Gardner (1):
>          UBUNTU: [Config] Dropped ubuntu/misc/wireless/acx
> 
> are available in the git repository at:
> 
>    git://kernel.ubuntu.com/manjo/ubuntu-karmic.git lp397906
> 
> FUJITA Tomonori (1):
>        block: call blk_scsi_ioctl_init()
> 
>   block/scsi_ioctl.c |    1 +
>   1 files changed, 1 insertions(+), 0 deletions(-)
> 
> From 5a4e8bed840c867d586b1220e35a6a1c852c51dd Mon Sep 17 00:00:00 2001
> From: FUJITA Tomonori <fujita.tomonori at lab.ntt.co.jp>
> Date: Thu, 9 Jul 2009 09:48:28 +0200
> Subject: [PATCH] block: call blk_scsi_ioctl_init()
> 
> Currently, blk_scsi_ioctl_init() is not called since it lacks
> an initcall marking. This causes the command table to be
> unitialized, hence somce commands are block when they should
> not have been.
> 
> This fixes a regression introduced by commit
> 018e0446890661504783f92388ecce7138c1566d
> 
> BugLink: https://bugs.launchpad.net/ubuntu/+source/linux/+bug/397906
> 
> Signed-off-by: FUJITA Tomonori <fujita.tomonori at lab.ntt.co.jp>
> Signed-off-by: Jens Axboe <jens.axboe at oracle.com>
> (cherry picked from commit 76da03467a1a78811777561bbb1fa56175ee4778)
> 
> Signed-off-by: Manoj Iyer <manoj.iyer at canonical.com>
> ---
>   block/scsi_ioctl.c |    1 +
>   1 files changed, 1 insertions(+), 0 deletions(-)
> 
> diff --git a/block/scsi_ioctl.c b/block/scsi_ioctl.c
> index f0e0ce0..e5b1001 100644
> --- a/block/scsi_ioctl.c
> +++ b/block/scsi_ioctl.c
> @@ -680,3 +680,4 @@ int __init blk_scsi_ioctl_init(void)
>   	blk_set_cmd_filter_defaults(&blk_default_cmd_filter);
>   	return 0;
>   }
> +fs_initcall(blk_scsi_ioctl_init);

Since this is already in Linus tree, we'll get it for free when Karmic 
is rebased for -rc3.

rtg
-- 
Tim Gardner tim.gardner at canonical.com