Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

target: Remove obsolete DF_READ_ONLY usage

Browse source 
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>
This commit is contained in:
Nicholas Bellinger 2012-03-20 21:26:48 -07:00
parent 0034102808
commit 58d9261877
3 changed files with 5 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
drivers/target/target_core_device.c
View file

@ -1341,7 +1341,6 @@ struct se_lun *core_dev_add_lun(
u32 lun) u32 lun)
{ {
struct se_lun *lun_p; struct se_lun *lun_p;
u32 lun_access = 0;
int rc; int rc;
if (atomic_read(&dev->dev_access_obj.obj_access_count) != 0) { if (atomic_read(&dev->dev_access_obj.obj_access_count) != 0) {
@ -1354,12 +1353,8 @@ struct se_lun *core_dev_add_lun(
if (IS_ERR(lun_p)) if (IS_ERR(lun_p))
return lun_p; return lun_p;
if (dev->dev_flags & DF_READ_ONLY) rc = core_tpg_post_addlun(tpg, lun_p,
lun_access = TRANSPORT_LUNFLAGS_READ_ONLY; TRANSPORT_LUNFLAGS_READ_WRITE, dev);
else
lun_access = TRANSPORT_LUNFLAGS_READ_WRITE;
rc = core_tpg_post_addlun(tpg, lun_p, lun_access, dev);
if (rc < 0) if (rc < 0)
return ERR_PTR(rc); return ERR_PTR(rc);

5
drivers/target/target_core_tpg.c
View file

@ -175,10 +175,7 @@ void core_tpg_add_node_to_devs(
* demo_mode_write_protect is ON, or READ_ONLY; * demo_mode_write_protect is ON, or READ_ONLY;
*/ */
if (!tpg->se_tpg_tfo->tpg_check_demo_mode_write_protect(tpg)) { if (!tpg->se_tpg_tfo->tpg_check_demo_mode_write_protect(tpg)) {
if (dev->dev_flags & DF_READ_ONLY) lun_access = TRANSPORT_LUNFLAGS_READ_WRITE;
lun_access = TRANSPORT_LUNFLAGS_READ_ONLY;
else
lun_access = TRANSPORT_LUNFLAGS_READ_WRITE;
} else { } else {
/* /*
* Allow only optical drives to issue R/W in default RO * Allow only optical drives to issue R/W in default RO

5
include/target/target_core_base.h
View file

@ -73,9 +73,8 @@
/* /*
* struct se_device->dev_flags * struct se_device->dev_flags
*/ */
#define DF_READ_ONLY 0x00000001 #define DF_SPC2_RESERVATIONS 0x00000001
#define DF_SPC2_RESERVATIONS 0x00000002 #define DF_SPC2_RESERVATIONS_WITH_ISID 0x00000002
#define DF_SPC2_RESERVATIONS_WITH_ISID 0x00000004
/* struct se_dev_attrib sanity values */ /* struct se_dev_attrib sanity values */
/* Default max_unmap_lba_count */ /* Default max_unmap_lba_count */