Skip to content

Commit

Permalink
target: Remove obsolete DF_READ_ONLY usage
Browse files Browse the repository at this point in the history
This was used at one time as a hack by FILEIO backend registration to
allow a struct block_device that was claimed with blkdev_get (by a local
filesystem mount for example) to be exported as read-only (SCSI WP=1).

Since FILEIO backend registration will no longer attempt to obtain
exclusive access to an underlying struct block_device here, this flag is
now obsolete.

Reported-by: Roland Dreier <roland@purestorage.com>
Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
  • Loading branch information
Nicholas Bellinger committed Apr 14, 2012
1 parent 0034102 commit 58d9261
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 14 deletions.
9 changes: 2 additions & 7 deletions drivers/target/target_core_device.c
Original file line number Diff line number Diff line change
Expand Up @@ -1341,7 +1341,6 @@ struct se_lun *core_dev_add_lun(
u32 lun)
{
struct se_lun *lun_p;
u32 lun_access = 0;
int rc;

if (atomic_read(&dev->dev_access_obj.obj_access_count) != 0) {
Expand All @@ -1354,12 +1353,8 @@ struct se_lun *core_dev_add_lun(
if (IS_ERR(lun_p))
return lun_p;

if (dev->dev_flags & DF_READ_ONLY)
lun_access = TRANSPORT_LUNFLAGS_READ_ONLY;
else
lun_access = TRANSPORT_LUNFLAGS_READ_WRITE;

rc = core_tpg_post_addlun(tpg, lun_p, lun_access, dev);
rc = core_tpg_post_addlun(tpg, lun_p,
TRANSPORT_LUNFLAGS_READ_WRITE, dev);
if (rc < 0)
return ERR_PTR(rc);

Expand Down
5 changes: 1 addition & 4 deletions drivers/target/target_core_tpg.c
Original file line number Diff line number Diff line change
Expand Up @@ -175,10 +175,7 @@ void core_tpg_add_node_to_devs(
* demo_mode_write_protect is ON, or READ_ONLY;
*/
if (!tpg->se_tpg_tfo->tpg_check_demo_mode_write_protect(tpg)) {
if (dev->dev_flags & DF_READ_ONLY)
lun_access = TRANSPORT_LUNFLAGS_READ_ONLY;
else
lun_access = TRANSPORT_LUNFLAGS_READ_WRITE;
lun_access = TRANSPORT_LUNFLAGS_READ_WRITE;
} else {
/*
* Allow only optical drives to issue R/W in default RO
Expand Down
5 changes: 2 additions & 3 deletions include/target/target_core_base.h
Original file line number Diff line number Diff line change
Expand Up @@ -73,9 +73,8 @@
/*
* struct se_device->dev_flags
*/
#define DF_READ_ONLY 0x00000001
#define DF_SPC2_RESERVATIONS 0x00000002
#define DF_SPC2_RESERVATIONS_WITH_ISID 0x00000004
#define DF_SPC2_RESERVATIONS 0x00000001
#define DF_SPC2_RESERVATIONS_WITH_ISID 0x00000002

/* struct se_dev_attrib sanity values */
/* Default max_unmap_lba_count */
Expand Down

0 comments on commit 58d9261

Please sign in to comment.