From 56aa8d3cdec6bbb56f36189d6eeb3b678c6c3021 Mon Sep 17 00:00:00 2001 From: Pete Zaitcev Date: Fri, 28 Apr 2006 20:45:49 -0700 Subject: [PATCH] --- yaml --- r: 28316 b: refs/heads/master c: 41fea55e0382b7d59d694d8055b39aa69c793b1f h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/block/ub.c | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 243c4fb1c179..ea00d08dd47f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4489a5712b086621a6c3f669057d2996245cd3fb +refs/heads/master: 41fea55e0382b7d59d694d8055b39aa69c793b1f diff --git a/trunk/drivers/block/ub.c b/trunk/drivers/block/ub.c index c688c25992e4..8eb44a55b9b8 100644 --- a/trunk/drivers/block/ub.c +++ b/trunk/drivers/block/ub.c @@ -1651,15 +1651,11 @@ static void ub_revalidate(struct ub_dev *sc, struct ub_lun *lun) static int ub_bd_open(struct inode *inode, struct file *filp) { struct gendisk *disk = inode->i_bdev->bd_disk; - struct ub_lun *lun; - struct ub_dev *sc; + struct ub_lun *lun = disk->private_data; + struct ub_dev *sc = lun->udev; unsigned long flags; int rc; - if ((lun = disk->private_data) == NULL) - return -ENXIO; - sc = lun->udev; - spin_lock_irqsave(&ub_lock, flags); if (atomic_read(&sc->poison)) { spin_unlock_irqrestore(&ub_lock, flags);