Browse Source

xen-scsiback: clean up a type issue in scsiback_make_tpg()

This code was confusing because we had an unsigned long and then we
compared it to UINT_MAX and then we stored it in a u16.  How many bytes
is this supposed to have: 2, 4 or 16???

I've made it a u16 throughout.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Reviewed-by: Juergen Gross <jgross@suse.com>
Signed-off-by: David Vrabel <david.vrabel@citrix.com>
Dan Carpenter 11 years ago
parent
commit
495daef902
1 changed files with 4 additions and 3 deletions
  1. 4 3
      drivers/xen/xen-scsiback.c

+ 4 - 3
drivers/xen/xen-scsiback.c

@@ -1885,13 +1885,14 @@ scsiback_make_tpg(struct se_wwn *wwn,
 			struct scsiback_tport, tport_wwn);
 			struct scsiback_tport, tport_wwn);
 
 
 	struct scsiback_tpg *tpg;
 	struct scsiback_tpg *tpg;
-	unsigned long tpgt;
+	u16 tpgt;
 	int ret;
 	int ret;
 
 
 	if (strstr(name, "tpgt_") != name)
 	if (strstr(name, "tpgt_") != name)
 		return ERR_PTR(-EINVAL);
 		return ERR_PTR(-EINVAL);
-	if (kstrtoul(name + 5, 10, &tpgt) || tpgt > UINT_MAX)
-		return ERR_PTR(-EINVAL);
+	ret = kstrtou16(name + 5, 10, &tpgt);
+	if (ret)
+		return ERR_PTR(ret);
 
 
 	tpg = kzalloc(sizeof(struct scsiback_tpg), GFP_KERNEL);
 	tpg = kzalloc(sizeof(struct scsiback_tpg), GFP_KERNEL);
 	if (!tpg)
 	if (!tpg)