Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 333019
b: refs/heads/master
c: 343d475
h: refs/heads/master
i:
  333017: 94552e2
  333015: 84b6efe
v: v3
  • Loading branch information
Andy Grover authored and Nicholas Bellinger committed Sep 17, 2012
1 parent 7a693af commit b1b2577
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 283669d282836c5b96faca9bcca184efb9618975
refs/heads/master: 343d475d6176fa081918fcbf3fcb0b0143e28661
8 changes: 4 additions & 4 deletions trunk/drivers/target/sbp/sbp_target.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit b1b2577

Please sign in to comment.