Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 173717
b: refs/heads/master
c: d6ae433
h: refs/heads/master
i:
  173715: 50c4243
v: v3
  • Loading branch information
Boaz Harrosh authored and James Bottomley committed Dec 4, 2009
1 parent ff31e98 commit aa895ab
Show file tree
Hide file tree
Showing 3 changed files with 78 additions and 87 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 89f5e1f2f13b1079b8d7ff7d3ade345b7ad7c009
refs/heads/master: d6ae4333e648492721a098bdc329bbd82d25eb67
162 changes: 77 additions & 85 deletions trunk/drivers/scsi/osd/osd_uld.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,7 @@
#define SCSI_OSD_MAX_MINOR 64

static const char osd_name[] = "osd";
static const char *osd_version_string = "open-osd 0.1.0";
const char osd_symlink[] = "scsi_osd";
static const char *osd_version_string = "open-osd 0.2.0";

MODULE_AUTHOR("Boaz Harrosh <bharrosh@panasas.com>");
MODULE_DESCRIPTION("open-osd Upper-Layer-Driver osd.ko");
Expand All @@ -82,15 +81,24 @@ MODULE_ALIAS_SCSI_DEVICE(TYPE_OSD);

struct osd_uld_device {
int minor;
struct kref kref;
struct device class_dev;
struct cdev cdev;
struct osd_dev od;
struct gendisk *disk;
struct device *class_member;
};

static void __uld_get(struct osd_uld_device *oud);
static void __uld_put(struct osd_uld_device *oud);
struct osd_dev_handle {
struct osd_dev od;
struct file *file;
struct osd_uld_device *oud;
} ;

static DEFINE_IDA(osd_minor_ida);

static struct class osd_uld_class = {
.owner = THIS_MODULE,
.name = "scsi_osd",
};

/*
* Char Device operations
Expand All @@ -101,7 +109,7 @@ static int osd_uld_open(struct inode *inode, struct file *file)
struct osd_uld_device *oud = container_of(inode->i_cdev,
struct osd_uld_device, cdev);

__uld_get(oud);
get_device(&oud->class_dev);
/* cache osd_uld_device on file handle */
file->private_data = oud;
OSD_DEBUG("osd_uld_open %p\n", oud);
Expand All @@ -114,7 +122,7 @@ static int osd_uld_release(struct inode *inode, struct file *file)

OSD_DEBUG("osd_uld_release %p\n", file->private_data);
file->private_data = NULL;
__uld_put(oud);
put_device(&oud->class_dev);
return 0;
}

Expand Down Expand Up @@ -177,7 +185,7 @@ static const struct file_operations osd_fops = {
struct osd_dev *osduld_path_lookup(const char *name)
{
struct osd_uld_device *oud;
struct osd_dev *od;
struct osd_dev_handle *odh;
struct file *file;
int error;

Expand All @@ -186,8 +194,8 @@ struct osd_dev *osduld_path_lookup(const char *name)
return ERR_PTR(-EINVAL);
}

od = kzalloc(sizeof(*od), GFP_KERNEL);
if (!od)
odh = kzalloc(sizeof(*odh), GFP_KERNEL);
if (unlikely(!odh))
return ERR_PTR(-ENOMEM);

file = filp_open(name, O_RDWR, 0);
Expand All @@ -203,37 +211,39 @@ struct osd_dev *osduld_path_lookup(const char *name)

oud = file->private_data;

*od = oud->od;
od->file = file;
odh->od = oud->od;
odh->file = file;
odh->oud = oud;

return od;
return &odh->od;

close_file:
fput(file);
free_od:
kfree(od);
kfree(odh);
return ERR_PTR(error);
}
EXPORT_SYMBOL(osduld_path_lookup);

void osduld_put_device(struct osd_dev *od)
{

if (od && !IS_ERR(od)) {
struct osd_uld_device *oud = od->file->private_data;
struct osd_dev_handle *odh =
container_of(od, struct osd_dev_handle, od);
struct osd_uld_device *oud = odh->oud;

BUG_ON(od->scsi_device != oud->od.scsi_device);

/* If scsi has released the device (logout), and exofs has last
* reference on oud it will be freed by above osd_uld_release
* within fput below. But this will oops in cdev_release which
* is called after the fops->release. __uld_get/put pair makes
* is called after the fops->release. A get_/put_ pair makes
* sure we have a cdev for the duration of fput
*/
__uld_get(oud);
fput(od->file);
__uld_put(oud);
kfree(od);
get_device(&oud->class_dev);
fput(odh->file);
put_device(&oud->class_dev);
kfree(odh);
}
}
EXPORT_SYMBOL(osduld_put_device);
Expand Down Expand Up @@ -264,8 +274,27 @@ static int __detect_osd(struct osd_uld_device *oud)
return 0;
}

static struct class *osd_sysfs_class;
static DEFINE_IDA(osd_minor_ida);
static void __remove(struct device *dev)
{
struct osd_uld_device *oud = container_of(dev, struct osd_uld_device,
class_dev);
struct scsi_device *scsi_device = oud->od.scsi_device;

if (oud->cdev.owner)
cdev_del(&oud->cdev);

osd_dev_fini(&oud->od);
scsi_device_put(scsi_device);

OSD_INFO("osd_remove %s\n",
oud->disk ? oud->disk->disk_name : NULL);

if (oud->disk)
put_disk(oud->disk);
ida_remove(&osd_minor_ida, oud->minor);

kfree(oud);
}

static int osd_probe(struct device *dev)
{
Expand Down Expand Up @@ -297,7 +326,6 @@ static int osd_probe(struct device *dev)
if (NULL == oud)
goto err_retract_minor;

kref_init(&oud->kref);
dev_set_drvdata(dev, oud);
oud->minor = minor;

Expand Down Expand Up @@ -335,18 +363,25 @@ static int osd_probe(struct device *dev)
OSD_ERR("cdev_add failed\n");
goto err_put_disk;
}
kobject_get(&oud->cdev.kobj); /* 2nd ref see osd_remove() */

/* class_member */
oud->class_member = device_create(osd_sysfs_class, dev,
MKDEV(SCSI_OSD_MAJOR, oud->minor), "%s", disk->disk_name);
if (IS_ERR(oud->class_member)) {
OSD_ERR("class_device_create failed\n");
error = PTR_ERR(oud->class_member);

/* class device member */
oud->class_dev.devt = oud->cdev.dev;
oud->class_dev.class = &osd_uld_class;
oud->class_dev.parent = dev;
oud->class_dev.release = __remove;
error = dev_set_name(&oud->class_dev, disk->disk_name);
if (error) {
OSD_ERR("dev_set_name failed => %d\n", error);
goto err_put_cdev;
}

dev_set_drvdata(oud->class_member, oud);
error = device_register(&oud->class_dev);
if (error) {
OSD_ERR("device_register failed => %d\n", error);
goto err_put_cdev;
}

get_device(&oud->class_dev);

OSD_INFO("osd_probe %s\n", disk->disk_name);
return 0;
Expand Down Expand Up @@ -375,54 +410,12 @@ static int osd_remove(struct device *dev)
scsi_device);
}

if (oud->class_member)
device_destroy(osd_sysfs_class,
MKDEV(SCSI_OSD_MAJOR, oud->minor));

/* We have 2 references to the cdev. One is released here
* and also takes down the /dev/osdX mapping. The second
* Will be released in __remove() after all users have released
* the osd_uld_device.
*/
if (oud->cdev.owner)
cdev_del(&oud->cdev);
device_unregister(&oud->class_dev);

__uld_put(oud);
put_device(&oud->class_dev);
return 0;
}

static void __remove(struct kref *kref)
{
struct osd_uld_device *oud = container_of(kref,
struct osd_uld_device, kref);
struct scsi_device *scsi_device = oud->od.scsi_device;

/* now let delete the char_dev */
kobject_put(&oud->cdev.kobj);

osd_dev_fini(&oud->od);
scsi_device_put(scsi_device);

OSD_INFO("osd_remove %s\n",
oud->disk ? oud->disk->disk_name : NULL);

if (oud->disk)
put_disk(oud->disk);

ida_remove(&osd_minor_ida, oud->minor);
kfree(oud);
}

static void __uld_get(struct osd_uld_device *oud)
{
kref_get(&oud->kref);
}

static void __uld_put(struct osd_uld_device *oud)
{
kref_put(&oud->kref, __remove);
}

/*
* Global driver and scsi registration
*/
Expand All @@ -440,11 +433,10 @@ static int __init osd_uld_init(void)
{
int err;

osd_sysfs_class = class_create(THIS_MODULE, osd_symlink);
if (IS_ERR(osd_sysfs_class)) {
OSD_ERR("Unable to register sysfs class => %ld\n",
PTR_ERR(osd_sysfs_class));
return PTR_ERR(osd_sysfs_class);
err = class_register(&osd_uld_class);
if (err) {
OSD_ERR("Unable to register sysfs class => %d\n", err);
return err;
}

err = register_chrdev_region(MKDEV(SCSI_OSD_MAJOR, 0),
Expand All @@ -467,15 +459,15 @@ static int __init osd_uld_init(void)
err_out_chrdev:
unregister_chrdev_region(MKDEV(SCSI_OSD_MAJOR, 0), SCSI_OSD_MAX_MINOR);
err_out:
class_destroy(osd_sysfs_class);
class_unregister(&osd_uld_class);
return err;
}

static void __exit osd_uld_exit(void)
{
scsi_unregister_driver(&osd_driver.gendrv);
unregister_chrdev_region(MKDEV(SCSI_OSD_MAJOR, 0), SCSI_OSD_MAX_MINOR);
class_destroy(osd_sysfs_class);
class_unregister(&osd_uld_class);
OSD_INFO("UNLOADED %s\n", osd_version_string);
}

Expand Down
1 change: 0 additions & 1 deletion trunk/include/scsi/osd_initiator.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ enum osd_std_version {
*/
struct osd_dev {
struct scsi_device *scsi_device;
struct file *file;
unsigned def_timeout;

#ifdef OSD_VER1_SUPPORT
Expand Down

0 comments on commit aa895ab

Please sign in to comment.