From b1b2577530885aa01a0833b8838eb2ae8de873d8 Mon Sep 17 00:00:00 2001 From: Andy Grover Date: Mon, 30 Jul 2012 15:54:18 -0700 Subject: [PATCH] --- yaml --- r: 333019 b: refs/heads/master c: 343d475d6176fa081918fcbf3fcb0b0143e28661 h: refs/heads/master i: 333017: 94552e26124cd4f81f5fec3fc3a511ae3db90f29 333015: 84b6efe20e7b5d88312240b4c963ef33cbc3afdd v: v3 --- [refs] | 2 +- trunk/drivers/target/sbp/sbp_target.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 3734da9411d3..eb7ae22b1250 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 283669d282836c5b96faca9bcca184efb9618975 +refs/heads/master: 343d475d6176fa081918fcbf3fcb0b0143e28661 diff --git a/trunk/drivers/target/sbp/sbp_target.c b/trunk/drivers/target/sbp/sbp_target.c index 39ddba584b30..713b88203799 100644 --- a/trunk/drivers/target/sbp/sbp_target.c +++ b/trunk/drivers/target/sbp/sbp_target.c @@ -2068,7 +2068,7 @@ static int sbp_update_unit_directory(struct sbp_tport *tport) return ret; } -static ssize_t sbp_parse_wwn(const char *name, u64 *wwn, int strict) +static ssize_t sbp_parse_wwn(const char *name, u64 *wwn) { const char *cp; char c, nibble; @@ -2088,7 +2088,7 @@ static ssize_t sbp_parse_wwn(const char *name, u64 *wwn, int strict) err = 3; if (isdigit(c)) nibble = c - '0'; - else if (isxdigit(c) && (islower(c) || !strict)) + else if (isxdigit(c)) nibble = tolower(c) - 'a' + 10; else goto fail; @@ -2117,7 +2117,7 @@ static struct se_node_acl *sbp_make_nodeacl( u64 guid = 0; u32 nexus_depth = 1; - if (sbp_parse_wwn(name, &guid, 1) < 0) + if (sbp_parse_wwn(name, &guid) < 0) return ERR_PTR(-EINVAL); se_nacl_new = sbp_alloc_fabric_acl(se_tpg); @@ -2253,7 +2253,7 @@ static struct se_wwn *sbp_make_tport( struct sbp_tport *tport; u64 guid = 0; - if (sbp_parse_wwn(name, &guid, 1) < 0) + if (sbp_parse_wwn(name, &guid) < 0) return ERR_PTR(-EINVAL); tport = kzalloc(sizeof(*tport), GFP_KERNEL);