| Message ID | 1432275071-28882-3-git-send-email-nab@daterainc.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Fri, May 22, 2015 at 06:11:04AM +0000, Nicholas A. Bellinger wrote: > + clear_bit(1, &orig->pr_reg); Can you call it ->flags and give the bit a meaningful name? > diff --git a/drivers/target/target_core_pr.c b/drivers/target/target_core_pr.c > index c0b593a..d29b39c 100644 > --- a/drivers/target/target_core_pr.c > +++ b/drivers/target/target_core_pr.c > @@ -327,9 +327,13 @@ static int core_scsi3_pr_seq_non_holder( > int we = 0; /* Write Exclusive */ > int legacy = 0; /* Act like a legacy device and return > * RESERVATION CONFLICT on some CDBs */ > + bool registered = false; > > rcu_read_lock(); > se_deve = target_nacl_find_deve(nacl, cmd->orig_fe_lun); > + if (se_deve) > + registered = test_bit(1, &se_deve->pr_reg); > + rcu_read_unlock(); It would be good to just sort out the registered and co variables here before the RCU changes, as in: http://git.infradead.org/users/hch/scsi.git/commitdiff/6372d9f62c83acb30d051387c40deb4dbdcaa376 -- To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Fri, 2015-05-22 at 10:26 +0200, Christoph Hellwig wrote: > On Fri, May 22, 2015 at 06:11:04AM +0000, Nicholas A. Bellinger wrote: > > + clear_bit(1, &orig->pr_reg); > > Can you call it ->flags and give the bit a meaningful name? The bit is signaling if se_dev_entry has a PR registration active. I don't see how ->flags is a more meaningful name without other bits defined. > > > diff --git a/drivers/target/target_core_pr.c b/drivers/target/target_core_pr.c > > index c0b593a..d29b39c 100644 > > --- a/drivers/target/target_core_pr.c > > +++ b/drivers/target/target_core_pr.c > > @@ -327,9 +327,13 @@ static int core_scsi3_pr_seq_non_holder( > > int we = 0; /* Write Exclusive */ > > int legacy = 0; /* Act like a legacy device and return > > * RESERVATION CONFLICT on some CDBs */ > > + bool registered = false; > > > > rcu_read_lock(); > > se_deve = target_nacl_find_deve(nacl, cmd->orig_fe_lun); > > + if (se_deve) > > + registered = test_bit(1, &se_deve->pr_reg); > > + rcu_read_unlock(); > > It would be good to just sort out the registered and co variables > here before the RCU changes, as in: > > http://git.infradead.org/users/hch/scsi.git/commitdiff/6372d9f62c83acb30d051387c40deb4dbdcaa376 Why not just keep this patch squashed into the relevant commit in the context of the larger RCU conversion..? -- To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 05/22/15 08:11, Nicholas A. Bellinger wrote: > diff --git a/include/target/target_core_base.h b/include/target/target_core_base.h > index e2c0eaf..def5bc8 100644 > --- a/include/target/target_core_base.h > +++ b/include/target/target_core_base.h > @@ -638,7 +638,6 @@ struct se_lun_acl { > }; > > struct se_dev_entry { > - bool def_pr_registered; > /* See transport_lunflags_table */ > u32 lun_flags; > u32 mapped_lun; > @@ -655,7 +654,8 @@ struct se_dev_entry { > struct se_node_acl *se_node_acl; > struct se_lun_acl __rcu *se_lun_acl; > spinlock_t ua_lock; > - struct se_lun *se_lun; > + struct se_lun __rcu *se_lun; > + unsigned long pr_reg; > struct list_head alua_port_list; > struct list_head ua_list; > struct hlist_node link; Hello Nic, This change causes the "se_lun = deve->se_lun" assignment in transport_lookup_cmd_lun() to assign an RCU pointer to a non-RCU pointer. Shouldn't such an assignment be protected via rcu_dereference() ? Thanks, Bart. -- To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Fri, May 22, 2015 at 02:05:57AM -0700, Nicholas A. Bellinger wrote: > On Fri, 2015-05-22 at 10:26 +0200, Christoph Hellwig wrote: > > On Fri, May 22, 2015 at 06:11:04AM +0000, Nicholas A. Bellinger wrote: > > > + clear_bit(1, &orig->pr_reg); > > > > Can you call it ->flags and give the bit a meaningful name? > > The bit is signaling if se_dev_entry has a PR registration active. > > I don't see how ->flags is a more meaningful name without other bits > defined. It's pretty normal style: define a flags variable for any sort of bitops state that might show up, and then give the actual bits a meaningful name. There's almost no users of using a magic numberic value with atomic bitops. Besides being the usual and thus easier to read style it's also good future proofing. > > It would be good to just sort out the registered and co variables > > here before the RCU changes, as in: > > > > http://git.infradead.org/users/hch/scsi.git/commitdiff/6372d9f62c83acb30d051387c40deb4dbdcaa376 > > Why not just keep this patch squashed into the relevant commit in the > context of the larger RCU conversion..? Because the logic in and aroudn core_scsi3_pr_seq_non_holder right now is rather confusing. So before doing changes to it it's better to clean it up first, document that cleanup in a standalon patch and then apply the logic change on top. -- To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
> > -/* > - * this function can be called with struct se_device->dev_reservation_lock > - * when register_move = 1 > - */ > static void __core_scsi3_add_registration( > struct se_device *dev, > struct se_node_acl *nacl, > @@ -1023,6 +1021,7 @@ static void __core_scsi3_add_registration( > const struct target_core_fabric_ops *tfo = nacl->se_tpg->se_tpg_tfo; > struct t10_pr_registration *pr_reg_tmp, *pr_reg_tmp_safe; > struct t10_reservation *pr_tmpl = &dev->t10_pr; > + struct se_dev_entry *deve; > > /* > * Increment PRgeneration counter for struct se_device upon a successful > @@ -1039,10 +1038,16 @@ static void __core_scsi3_add_registration( > > spin_lock(&pr_tmpl->registration_lock); > list_add_tail(&pr_reg->pr_reg_list, &pr_tmpl->registration_list); > - pr_reg->pr_reg_deve->def_pr_registered = 1; > > __core_scsi3_dump_registration(tfo, dev, nacl, pr_reg, register_type); > spin_unlock(&pr_tmpl->registration_lock); > + > + mutex_lock(&nacl->lun_entry_mutex); > + deve = target_nacl_find_deve(nacl, pr_reg->pr_res_mapped_lun); > + if (deve) > + set_bit(1, &deve->pr_reg); > + mutex_unlock(&nacl->lun_entry_mutex); Why can't we rely on pr_reg->pr_reg_deve here? The way the it's set up is a bit convoluted, but unless I miss something it needs to have a reference if it's set (and it it doesn't that needs to be fixed ASAP). Also even if we would need a target_nacl_find_deve call here it could be done under rcu_read_lock as lun_entry_hlist isn't modified. > + mutex_lock(&nacl->lun_entry_mutex); > + deve = target_nacl_find_deve(nacl_tmp, pr_reg_tmp->pr_res_mapped_lun); > + if (deve) > + set_bit(1, &deve->pr_reg); > + mutex_unlock(&nacl->lun_entry_mutex); > + Same here. > @@ -1258,6 +1269,8 @@ static void __core_scsi3_free_registration( > */ > if (dec_holders) > core_scsi3_put_pr_reg(pr_reg); > + > + spin_unlock(&pr_tmpl->registration_lock); > /* > * Wait until all reference from any other I_T nexuses for this > * *pr_reg have been released. Because list_del() is called above, > @@ -1265,13 +1278,18 @@ static void __core_scsi3_free_registration( > * count back to zero, and we release *pr_reg. > */ > while (atomic_read(&pr_reg->pr_res_holders) != 0) { > - spin_unlock(&pr_tmpl->registration_lock); > pr_debug("SPC-3 PR [%s] waiting for pr_res_holders\n", > tfo->get_fabric_name()); > cpu_relax(); > - spin_lock(&pr_tmpl->registration_lock); > } > > + mutex_lock(&nacl->lun_entry_mutex); > + deve = target_nacl_find_deve(nacl, pr_reg->pr_res_mapped_lun); > + if (deve) > + clear_bit(1, &deve->pr_reg); > + mutex_unlock(&nacl->lun_entry_mutex); And here. -- To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Fri, 2015-05-22 at 12:12 +0200, Bart Van Assche wrote: > On 05/22/15 08:11, Nicholas A. Bellinger wrote: > > diff --git a/include/target/target_core_base.h b/include/target/target_core_base.h > > index e2c0eaf..def5bc8 100644 > > --- a/include/target/target_core_base.h > > +++ b/include/target/target_core_base.h > > @@ -638,7 +638,6 @@ struct se_lun_acl { > > }; > > > > struct se_dev_entry { > > - bool def_pr_registered; > > /* See transport_lunflags_table */ > > u32 lun_flags; > > u32 mapped_lun; > > @@ -655,7 +654,8 @@ struct se_dev_entry { > > struct se_node_acl *se_node_acl; > > struct se_lun_acl __rcu *se_lun_acl; > > spinlock_t ua_lock; > > - struct se_lun *se_lun; > > + struct se_lun __rcu *se_lun; > > + unsigned long pr_reg; > > struct list_head alua_port_list; > > struct list_head ua_list; > > struct hlist_node link; > > Hello Nic, > > This change causes the "se_lun = deve->se_lun" assignment in > transport_lookup_cmd_lun() to assign an RCU pointer to a non-RCU > pointer. Shouldn't such an assignment be protected via rcu_dereference() ? > FYI, these assignments are done in patch #1. This __rcu notation should be included there instead. -- To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Fri, 2015-05-22 at 13:34 +0200, Christoph Hellwig wrote: > On Fri, May 22, 2015 at 02:05:57AM -0700, Nicholas A. Bellinger wrote: > > On Fri, 2015-05-22 at 10:26 +0200, Christoph Hellwig wrote: > > > On Fri, May 22, 2015 at 06:11:04AM +0000, Nicholas A. Bellinger wrote: > > > > + clear_bit(1, &orig->pr_reg); > > > > > > Can you call it ->flags and give the bit a meaningful name? > > > > The bit is signaling if se_dev_entry has a PR registration active. > > > > I don't see how ->flags is a more meaningful name without other bits > > defined. > > It's pretty normal style: define a flags variable for any sort of > bitops state that might show up, and then give the actual bits a meaningful > name. There's almost no users of using a magic numberic value with > atomic bitops. > > Besides being the usual and thus easier to read style it's also good > future proofing. Fair enough. Changing this to ->deve_flags > > > > It would be good to just sort out the registered and co variables > > > here before the RCU changes, as in: > > > > > > http://git.infradead.org/users/hch/scsi.git/commitdiff/6372d9f62c83acb30d051387c40deb4dbdcaa376 > > > > Why not just keep this patch squashed into the relevant commit in the > > context of the larger RCU conversion..? > > Because the logic in and aroudn core_scsi3_pr_seq_non_holder right > now is rather confusing. So before doing changes to it it's better > to clean it up first, document that cleanup in a standalon patch > and then apply the logic change on top. > -- I'll keep it in a standalone patch, but having it precede the RCU changes when it doesn't actually involve RCU is confusing. -- To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Fri, 2015-05-22 at 13:52 +0200, Christoph Hellwig wrote: > > > > -/* > > - * this function can be called with struct se_device->dev_reservation_lock > > - * when register_move = 1 > > - */ > > static void __core_scsi3_add_registration( > > struct se_device *dev, > > struct se_node_acl *nacl, > > @@ -1023,6 +1021,7 @@ static void __core_scsi3_add_registration( > > const struct target_core_fabric_ops *tfo = nacl->se_tpg->se_tpg_tfo; > > struct t10_pr_registration *pr_reg_tmp, *pr_reg_tmp_safe; > > struct t10_reservation *pr_tmpl = &dev->t10_pr; > > + struct se_dev_entry *deve; > > > > /* > > * Increment PRgeneration counter for struct se_device upon a successful > > @@ -1039,10 +1038,16 @@ static void __core_scsi3_add_registration( > > > > spin_lock(&pr_tmpl->registration_lock); > > list_add_tail(&pr_reg->pr_reg_list, &pr_tmpl->registration_list); > > - pr_reg->pr_reg_deve->def_pr_registered = 1; > > > > __core_scsi3_dump_registration(tfo, dev, nacl, pr_reg, register_type); > > spin_unlock(&pr_tmpl->registration_lock); > > + > > + mutex_lock(&nacl->lun_entry_mutex); > > + deve = target_nacl_find_deve(nacl, pr_reg->pr_res_mapped_lun); > > + if (deve) > > + set_bit(1, &deve->pr_reg); > > + mutex_unlock(&nacl->lun_entry_mutex); > > Why can't we rely on pr_reg->pr_reg_deve here? The way the it's > set up is a bit convoluted, but unless I miss something it needs to > have a reference if it's set (and it it doesn't that needs to be fixed > ASAP). > So pr_reg->pr_reg_deve is only referenced in the context of ALL_TG_PT=1, I_PORT=1 and REGISTER_AND_MOVE registration, when pr_reg->pr_kref is already held. > > Also even if we would need a target_nacl_find_deve call here it could > be done under rcu_read_lock as lun_entry_hlist isn't modified. > Probably not. Changing these to rcu_read_lock. > > + mutex_lock(&nacl->lun_entry_mutex); > > + deve = target_nacl_find_deve(nacl_tmp, pr_reg_tmp->pr_res_mapped_lun); > > + if (deve) > > + set_bit(1, &deve->pr_reg); > > + mutex_unlock(&nacl->lun_entry_mutex); > > + > It should be fine to dereference pr_reg_tmp->pr_reg_deve directly here. > > > @@ -1258,6 +1269,8 @@ static void __core_scsi3_free_registration( > > */ > > if (dec_holders) > > core_scsi3_put_pr_reg(pr_reg); > > + > > + spin_unlock(&pr_tmpl->registration_lock); > > /* > > * Wait until all reference from any other I_T nexuses for this > > * *pr_reg have been released. Because list_del() is called above, > > @@ -1265,13 +1278,18 @@ static void __core_scsi3_free_registration( > > * count back to zero, and we release *pr_reg. > > */ > > while (atomic_read(&pr_reg->pr_res_holders) != 0) { > > - spin_unlock(&pr_tmpl->registration_lock); > > pr_debug("SPC-3 PR [%s] waiting for pr_res_holders\n", > > tfo->get_fabric_name()); > > cpu_relax(); > > - spin_lock(&pr_tmpl->registration_lock); > > } > > > > + mutex_lock(&nacl->lun_entry_mutex); > > + deve = target_nacl_find_deve(nacl, pr_reg->pr_res_mapped_lun); > > + if (deve) > > + clear_bit(1, &deve->pr_reg); > > + mutex_unlock(&nacl->lun_entry_mutex); > > And here. This is not going to work, because __core_scsi3_free_registration() can be invoked via core_disable_device_list_for_node() -> core_scsi3_free_pr_reg_from_nacl(), after the kfree_rcu() for se_dev_entry has occurred. So keeping the extra lookup for this one particular case, and dropping the rest. -- To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/target/target_core_device.c b/drivers/target/target_core_device.c index cfe5cd3..6432d26 100644 --- a/drivers/target/target_core_device.c +++ b/drivers/target/target_core_device.c @@ -405,6 +405,7 @@ void core_disable_device_list_for_node( core_scsi3_ua_release_all(orig); hlist_del_rcu(&orig->link); + clear_bit(1, &orig->pr_reg); rcu_assign_pointer(orig->se_lun, NULL); rcu_assign_pointer(orig->se_lun_acl, NULL); orig->lun_flags = 0; diff --git a/drivers/target/target_core_pr.c b/drivers/target/target_core_pr.c index c0b593a..d29b39c 100644 --- a/drivers/target/target_core_pr.c +++ b/drivers/target/target_core_pr.c @@ -327,9 +327,13 @@ static int core_scsi3_pr_seq_non_holder( int we = 0; /* Write Exclusive */ int legacy = 0; /* Act like a legacy device and return * RESERVATION CONFLICT on some CDBs */ + bool registered = false; rcu_read_lock(); se_deve = target_nacl_find_deve(nacl, cmd->orig_fe_lun); + if (se_deve) + registered = test_bit(1, &se_deve->pr_reg); + rcu_read_unlock(); /* * Determine if the registration should be ignored due to * non-matching ISIDs in target_scsi3_pr_reservation_check(). @@ -346,7 +350,7 @@ static int core_scsi3_pr_seq_non_holder( * Some commands are only allowed for the persistent reservation * holder. */ - if ((se_deve->def_pr_registered) && !(ignore_reg)) + if ((registered) && !(ignore_reg)) registered_nexus = 1; break; case PR_TYPE_WRITE_EXCLUSIVE_REGONLY: @@ -356,7 +360,7 @@ static int core_scsi3_pr_seq_non_holder( * Some commands are only allowed for registered I_T Nexuses. */ reg_only = 1; - if ((se_deve->def_pr_registered) && !(ignore_reg)) + if ((registered) && !(ignore_reg)) registered_nexus = 1; break; case PR_TYPE_WRITE_EXCLUSIVE_ALLREG: @@ -366,14 +370,12 @@ static int core_scsi3_pr_seq_non_holder( * Each registered I_T Nexus is a reservation holder. */ all_reg = 1; - if ((se_deve->def_pr_registered) && !(ignore_reg)) + if ((registered) && !(ignore_reg)) registered_nexus = 1; break; default: - rcu_read_unlock(); return -EINVAL; } - rcu_read_unlock(); /* * Referenced from spc4r17 table 45 for *NON* PR holder access */ @@ -1009,10 +1011,6 @@ static void __core_scsi3_dump_registration( pr_reg->pr_reg_aptpl); } -/* - * this function can be called with struct se_device->dev_reservation_lock - * when register_move = 1 - */ static void __core_scsi3_add_registration( struct se_device *dev, struct se_node_acl *nacl, @@ -1023,6 +1021,7 @@ static void __core_scsi3_add_registration( const struct target_core_fabric_ops *tfo = nacl->se_tpg->se_tpg_tfo; struct t10_pr_registration *pr_reg_tmp, *pr_reg_tmp_safe; struct t10_reservation *pr_tmpl = &dev->t10_pr; + struct se_dev_entry *deve; /* * Increment PRgeneration counter for struct se_device upon a successful @@ -1039,10 +1038,16 @@ static void __core_scsi3_add_registration( spin_lock(&pr_tmpl->registration_lock); list_add_tail(&pr_reg->pr_reg_list, &pr_tmpl->registration_list); - pr_reg->pr_reg_deve->def_pr_registered = 1; __core_scsi3_dump_registration(tfo, dev, nacl, pr_reg, register_type); spin_unlock(&pr_tmpl->registration_lock); + + mutex_lock(&nacl->lun_entry_mutex); + deve = target_nacl_find_deve(nacl, pr_reg->pr_res_mapped_lun); + if (deve) + set_bit(1, &deve->pr_reg); + mutex_unlock(&nacl->lun_entry_mutex); + /* * Skip extra processing for ALL_TG_PT=0 or REGISTER_AND_MOVE. */ @@ -1054,6 +1059,8 @@ static void __core_scsi3_add_registration( */ list_for_each_entry_safe(pr_reg_tmp, pr_reg_tmp_safe, &pr_reg->pr_reg_atp_list, pr_reg_atp_mem_list) { + struct se_node_acl *nacl_tmp = pr_reg_tmp->pr_reg_nacl; + list_del(&pr_reg_tmp->pr_reg_atp_mem_list); pr_reg_tmp->pr_res_generation = core_scsi3_pr_generation(dev); @@ -1061,13 +1068,17 @@ static void __core_scsi3_add_registration( spin_lock(&pr_tmpl->registration_lock); list_add_tail(&pr_reg_tmp->pr_reg_list, &pr_tmpl->registration_list); - pr_reg_tmp->pr_reg_deve->def_pr_registered = 1; - __core_scsi3_dump_registration(tfo, dev, - pr_reg_tmp->pr_reg_nacl, pr_reg_tmp, - register_type); + __core_scsi3_dump_registration(tfo, dev, nacl_tmp, pr_reg_tmp, + register_type); spin_unlock(&pr_tmpl->registration_lock); + mutex_lock(&nacl->lun_entry_mutex); + deve = target_nacl_find_deve(nacl_tmp, pr_reg_tmp->pr_res_mapped_lun); + if (deve) + set_bit(1, &deve->pr_reg); + mutex_unlock(&nacl->lun_entry_mutex); + /* * Drop configfs group dependency reference from * __core_scsi3_alloc_registration() @@ -1243,13 +1254,13 @@ static void __core_scsi3_free_registration( const struct target_core_fabric_ops *tfo = pr_reg->pr_reg_nacl->se_tpg->se_tpg_tfo; struct t10_reservation *pr_tmpl = &dev->t10_pr; + struct se_node_acl *nacl = pr_reg->pr_reg_nacl; + struct se_dev_entry *deve; char i_buf[PR_REG_ISID_ID_LEN]; memset(i_buf, 0, PR_REG_ISID_ID_LEN); core_pr_dump_initiator_port(pr_reg, i_buf, PR_REG_ISID_ID_LEN); - pr_reg->pr_reg_deve->def_pr_registered = 0; - pr_reg->pr_reg_deve->pr_res_key = 0; if (!list_empty(&pr_reg->pr_reg_list)) list_del(&pr_reg->pr_reg_list); /* @@ -1258,6 +1269,8 @@ static void __core_scsi3_free_registration( */ if (dec_holders) core_scsi3_put_pr_reg(pr_reg); + + spin_unlock(&pr_tmpl->registration_lock); /* * Wait until all reference from any other I_T nexuses for this * *pr_reg have been released. Because list_del() is called above, @@ -1265,13 +1278,18 @@ static void __core_scsi3_free_registration( * count back to zero, and we release *pr_reg. */ while (atomic_read(&pr_reg->pr_res_holders) != 0) { - spin_unlock(&pr_tmpl->registration_lock); pr_debug("SPC-3 PR [%s] waiting for pr_res_holders\n", tfo->get_fabric_name()); cpu_relax(); - spin_lock(&pr_tmpl->registration_lock); } + mutex_lock(&nacl->lun_entry_mutex); + deve = target_nacl_find_deve(nacl, pr_reg->pr_res_mapped_lun); + if (deve) + clear_bit(1, &deve->pr_reg); + mutex_unlock(&nacl->lun_entry_mutex); + + spin_lock(&pr_tmpl->registration_lock); pr_debug("SPC-3 PR [%s] Service Action: UNREGISTER Initiator" " Node: %s%s\n", tfo->get_fabric_name(), pr_reg->pr_reg_nacl->initiatorname, @@ -3428,13 +3446,14 @@ after_iport_check: dest_pr_reg = __core_scsi3_locate_pr_reg(dev, dest_node_acl, iport_ptr); if (!dest_pr_reg) { + spin_unlock(&dev->dev_reservation_lock); if (core_scsi3_alloc_registration(cmd->se_dev, dest_node_acl, dest_se_deve, iport_ptr, sa_res_key, 0, aptpl, 2, 1)) { - spin_unlock(&dev->dev_reservation_lock); ret = TCM_INVALID_PARAMETER_LIST; goto out; } + spin_lock(&dev->dev_reservation_lock); dest_pr_reg = __core_scsi3_locate_pr_reg(dev, dest_node_acl, iport_ptr); new_reg = 1; diff --git a/include/target/target_core_base.h b/include/target/target_core_base.h index e2c0eaf..def5bc8 100644 --- a/include/target/target_core_base.h +++ b/include/target/target_core_base.h @@ -638,7 +638,6 @@ struct se_lun_acl { }; struct se_dev_entry { - bool def_pr_registered; /* See transport_lunflags_table */ u32 lun_flags; u32 mapped_lun; @@ -655,7 +654,8 @@ struct se_dev_entry { struct se_node_acl *se_node_acl; struct se_lun_acl __rcu *se_lun_acl; spinlock_t ua_lock; - struct se_lun *se_lun; + struct se_lun __rcu *se_lun; + unsigned long pr_reg; struct list_head alua_port_list; struct list_head ua_list; struct hlist_node link;