Skip to content

usb: gadget: mass_storage: added sysfs entry for cdrom to LUNs #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
FrozenCow wants to merge 1 commit into
base: 5.1.1
Choose a base branch
from
Open

usb: gadget: mass_storage: added sysfs entry for cdrom to LUNs #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions drivers/usb/gadget/f_mass_storage.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3082,6 +3082,7 @@ static struct device_attribute dev_attr_ro_cdrom =
static struct device_attribute dev_attr_file_nonremovable =
__ATTR(file, 0644, fsg_show_file, fsg_store_file);

static DEVICE_ATTR(cdrom, 0644, fsg_show_cdrom, fsg_store_cdrom);
#ifdef CONFIG_USB_MSC_PROFILING
static DEVICE_ATTR(perf, 0644, fsg_show_perf, fsg_store_perf);
#endif
Expand Down Expand Up @@ -3164,6 +3165,10 @@ static int create_lun_device(struct fsg_common *common,
if (rc)
goto error_luns;

rc = device_create_file(&curlun->dev, &dev_attr_cdrom);
if (rc)
goto error_luns;

#ifdef CONFIG_USB_MSC_PROFILING
rc = device_create_file(&curlun->dev, &dev_attr_perf);
if (rc)
Expand Down Expand Up @@ -3370,6 +3375,7 @@ static void fsg_common_release(struct kref *ref)
#ifdef CONFIG_USB_MSC_PROFILING
device_remove_file(&lun->dev, &dev_attr_perf);
#endif
device_remove_file(&lun->dev, &dev_attr_cdrom);
device_remove_file(&lun->dev, &dev_attr_nofua);
device_remove_file(&lun->dev,
lun->cdrom
Expand Down
37 changes: 37 additions & 0 deletions drivers/usb/gadget/storage_common.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -841,3 +841,40 @@ static ssize_t fsg_store_file(struct device *dev, struct device_attribute *attr,
up_write(filesem);
return (rc < 0 ? rc : count);
}

static ssize_t fsg_show_cdrom (struct device *dev, struct device_attribute *attr,
char *buf)
{
struct fsg_lun *curlun = fsg_lun_from_dev(dev);

return sprintf(buf, "%d\n", curlun->cdrom);
}

static ssize_t fsg_store_cdrom(struct device *dev, struct device_attribute *attr,
const char *buf, size_t count)
{
ssize_t rc;
struct fsg_lun *curlun = fsg_lun_from_dev(dev);
struct rw_semaphore *filesem = dev_get_drvdata(dev);
unsigned cdrom;

rc = kstrtouint(buf, 2, &cdrom);
if (rc)
return rc;

/*
* Allow the cdrom status to change only while the
* backing file is closed.
*/
down_read(filesem);
if (fsg_lun_is_open(curlun)) {
LDBG(curlun, "cdrom status change prevented\n");
rc = -EBUSY;
} else {
curlun->cdrom = cdrom;
LDBG(curlun, "cdrom status set to %d\n", curlun->cdrom);
rc = count;
}
up_read(filesem);
return rc;
}