diff options
author | Andy Grover <agrover@redhat.com> | 2012-07-30 18:54:18 -0400 |
---|---|---|
committer | Nicholas Bellinger <nab@linux-iscsi.org> | 2012-09-17 19:15:47 -0400 |
commit | 343d475d6176fa081918fcbf3fcb0b0143e28661 (patch) | |
tree | 7e833ef529b2943dfe7473ba3f8ce22bd108bc4d /drivers/target | |
parent | 283669d282836c5b96faca9bcca184efb9618975 (diff) |
target/sbp: Remove strict param from sbp_parse_wwn
It's always set, and controls whether uppercase A-F are allowed hex values.
I don't see a reason not to accept these.
Signed-off-by: Andy Grover <agrover@redhat.com>
Cc: Chris Boot <bootc@bootc.net>
Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
Diffstat (limited to 'drivers/target')
-rw-r--r-- | drivers/target/sbp/sbp_target.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/target/sbp/sbp_target.c b/drivers/target/sbp/sbp_target.c index 39ddba584b30..713b88203799 100644 --- a/drivers/target/sbp/sbp_target.c +++ b/drivers/target/sbp/sbp_target.c | |||
@@ -2068,7 +2068,7 @@ static int sbp_update_unit_directory(struct sbp_tport *tport) | |||
2068 | return ret; | 2068 | return ret; |
2069 | } | 2069 | } |
2070 | 2070 | ||
2071 | static ssize_t sbp_parse_wwn(const char *name, u64 *wwn, int strict) | 2071 | static ssize_t sbp_parse_wwn(const char *name, u64 *wwn) |
2072 | { | 2072 | { |
2073 | const char *cp; | 2073 | const char *cp; |
2074 | char c, nibble; | 2074 | char c, nibble; |
@@ -2088,7 +2088,7 @@ static ssize_t sbp_parse_wwn(const char *name, u64 *wwn, int strict) | |||
2088 | err = 3; | 2088 | err = 3; |
2089 | if (isdigit(c)) | 2089 | if (isdigit(c)) |
2090 | nibble = c - '0'; | 2090 | nibble = c - '0'; |
2091 | else if (isxdigit(c) && (islower(c) || !strict)) | 2091 | else if (isxdigit(c)) |
2092 | nibble = tolower(c) - 'a' + 10; | 2092 | nibble = tolower(c) - 'a' + 10; |
2093 | else | 2093 | else |
2094 | goto fail; | 2094 | goto fail; |
@@ -2117,7 +2117,7 @@ static struct se_node_acl *sbp_make_nodeacl( | |||
2117 | u64 guid = 0; | 2117 | u64 guid = 0; |
2118 | u32 nexus_depth = 1; | 2118 | u32 nexus_depth = 1; |
2119 | 2119 | ||
2120 | if (sbp_parse_wwn(name, &guid, 1) < 0) | 2120 | if (sbp_parse_wwn(name, &guid) < 0) |
2121 | return ERR_PTR(-EINVAL); | 2121 | return ERR_PTR(-EINVAL); |
2122 | 2122 | ||
2123 | se_nacl_new = sbp_alloc_fabric_acl(se_tpg); | 2123 | se_nacl_new = sbp_alloc_fabric_acl(se_tpg); |
@@ -2253,7 +2253,7 @@ static struct se_wwn *sbp_make_tport( | |||
2253 | struct sbp_tport *tport; | 2253 | struct sbp_tport *tport; |
2254 | u64 guid = 0; | 2254 | u64 guid = 0; |
2255 | 2255 | ||
2256 | if (sbp_parse_wwn(name, &guid, 1) < 0) | 2256 | if (sbp_parse_wwn(name, &guid) < 0) |
2257 | return ERR_PTR(-EINVAL); | 2257 | return ERR_PTR(-EINVAL); |
2258 | 2258 | ||
2259 | tport = kzalloc(sizeof(*tport), GFP_KERNEL); | 2259 | tport = kzalloc(sizeof(*tport), GFP_KERNEL); |