diff options
| author | Roland Dreier <roland@purestorage.com> | 2012-02-23 17:22:12 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-04-02 09:27:12 -0700 |
| commit | 91e4c264a6f7b2de2fa5d996db9297e99bfb1006 (patch) | |
| tree | 36505fe312a97108b995182761fe2dc241329fac | |
| parent | 2a540015f107ec0b073725ab7575bd7990e094d9 (diff) | |
| download | kernel_samsung_espresso10-91e4c264a6f7b2de2fa5d996db9297e99bfb1006.zip kernel_samsung_espresso10-91e4c264a6f7b2de2fa5d996db9297e99bfb1006.tar.gz kernel_samsung_espresso10-91e4c264a6f7b2de2fa5d996db9297e99bfb1006.tar.bz2 | |
target: Fix 16-bit target ports for SET TARGET PORT GROUPS emulation
commit 33395fb8a13731c7ef7b175dbf5a4d8a6738fe6c upstream.
The old code did (MSB << 8) & 0xff, which always evaluates to 0. Just use
get_unaligned_be16() so we don't have to worry about whether our open-coded
version is correct or not.
Signed-off-by: Roland Dreier <roland@purestorage.com>
Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/target/target_core_alua.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/target/target_core_alua.c b/drivers/target/target_core_alua.c index 86b3660..c967405 100644 --- a/drivers/target/target_core_alua.c +++ b/drivers/target/target_core_alua.c @@ -30,6 +30,7 @@ #include <linux/configfs.h> #include <scsi/scsi.h> #include <scsi/scsi_cmnd.h> +#include <asm/unaligned.h> #include <target/target_core_base.h> #include <target/target_core_device.h> @@ -238,8 +239,7 @@ int core_emulate_set_target_port_groups(struct se_cmd *cmd) * changed. */ if (primary) { - tg_pt_id = ((ptr[2] << 8) & 0xff); - tg_pt_id |= (ptr[3] & 0xff); + tg_pt_id = get_unaligned_be16(ptr + 2); /* * Locate the matching target port group ID from * the global tg_pt_gp list @@ -280,8 +280,7 @@ int core_emulate_set_target_port_groups(struct se_cmd *cmd) * the Target Port in question for the the incoming * SET_TARGET_PORT_GROUPS op. */ - rtpi = ((ptr[2] << 8) & 0xff); - rtpi |= (ptr[3] & 0xff); + rtpi = get_unaligned_be16(ptr + 2); /* * Locate the matching relative target port identifer * for the struct se_device storage object. |