linux.git/drivers/target/target_core_pr.c, branch v3.11

target: Make core_scsi3_update_and_write_aptpl return sense_reason_t

2013-07-04T02:44:33+00:00

Fix up sense_reason_t breakage in core_scsi3_update_and_write_aptpl()
from recent conversion to use local scope memory allocation.

Reported as sparse warnings: (new ones prefixed by >>) by Fengguang:

>> drivers/target/target_core_pr.c:2069:57: sparse: incorrect type in
>> return expression (different base types)
   drivers/target/target_core_pr.c:2069:57:    expected restricted sense_reason_t
   drivers/target/target_core_pr.c:2069:57:    got int
>> drivers/target/target_core_pr.c:2179:21: sparse: incorrect type in
>> assignment (different base types)
   drivers/target/target_core_pr.c:2179:21:    expected restricted sense_reason_t [assigned] [usertype] ret
   drivers/target/target_core_pr.c:2179:21:    got int
>> drivers/target/target_core_pr.c:2197:13: sparse: incorrect type in
>> assignment (different base types)
   drivers/target/target_core_pr.c:2197:13:    expected restricted sense_reason_t [assigned] [usertype] ret
   drivers/target/target_core_pr.c:2197:13:    got int
   drivers/target/target_core_pr.c:1245:28: sparse: context imbalance in '__core_scsi3_free_registration' - unexpected unlock

Reported-by: kbuild test robot 
Cc: Andy Grover 
Signed-off-by: Nicholas Bellinger

target: Further refactoring of core_scsi3_emulate_pro_register()

2013-06-14T07:05:48+00:00

Use bool params when appropriate.

Eliminate unneeded pr_reg_e and type variables.

Just one goto label, so rename to 'out' from 'out_put_pr_reg'.

Signed-off-by: Andy Grover 
Signed-off-by: Nicholas Bellinger

target: Use if/else for sa_res_key conditional in emulate_pro_register()

2013-06-14T07:05:43+00:00

Don't need goto, we can just do an if/else for sa_res_key behavior. Move
shorter case first. Slightly shorter b/c both cases can share a call to
update_and_write_aptpl() now.

Signed-off-by: Andy Grover 
Signed-off-by: Nicholas Bellinger

target: Allocate aptpl_buf inside update_and_write_aptpl()

2013-06-14T07:04:58+00:00

Instead of taking the buffer and length, update_and_write_aptpl() will
allocate the buffer as needed, and then free it. Instead, the function
takes an 'aptpl' boolean parameter.

This enables us to remove memory alloc/frees from struct
t10_pr_registration and other spots.

There is a slight loss of functionality because each callsite doesn't get
its own pr_debug any more, but this info can be cleaned via ftrace if
necessary and I think the shorter code is worth it.

Signed-off-by: Andy Grover 
Signed-off-by: Nicholas Bellinger

target: Delete incorrect comment

2013-06-14T07:04:54+00:00

aptpl_file_mutex seems to no longer exist.

Signed-off-by: Andy Grover 
Signed-off-by: Nicholas Bellinger

target: Remove unneeded param pr_aptpl_buf_len to write_aptpl_to_file()

2013-06-14T07:04:50+00:00

As mentioned in the comments in update_and_write_aptpl,
write_aptpl_to_file() calls strlen() on the buffer, and the length was
always being passed as zero.

Signed-off-by: Andy Grover 
Signed-off-by: Nicholas Bellinger

target: Remove t10_reservation.pr_aptpl_buf_len

2013-06-14T07:04:46+00:00

It's only ever set to PR_APTPL_BUF_LEN, so we don't need a variable.

Signed-off-by: Andy Grover 
Signed-off-by: Nicholas Bellinger

target: Unify __core_scsi3_update_aptpl_buf and core_scsi3_update_aptpl_buf

2013-06-14T07:04:43+00:00

The __ version is only ever called from the regular version, so just
inline it. It's not too much more complex to handle both spinlocks in the
same function.

Signed-off-by: Andy Grover 
Signed-off-by: Nicholas Bellinger

target: Simplify metadata handling when clearing aptpl metadata

2013-06-14T07:04:39+00:00

Simpler to just set buf in update_and_write_aptpl(), rather than passing
down to ____core_scsi3_update_aptpl_buf().

Signed-off-by: Andy Grover 
Signed-off-by: Nicholas Bellinger

target: Fix two debugprints that appear to be wrong

2013-06-14T07:04:35+00:00

They're in emulate_pro_register, so change UNREGISTER to REGISTER.

The first one seems wrong -- sa_res_key could be 0 there, but it's testing
spec_i_pt.

Remove unneeded parens  in 2nd conditional.

Signed-off-by: Andy Grover 
Signed-off-by: Nicholas Bellinger