From: Andy Grover Date: Thu, 16 May 2013 17:41:00 +0000 (-0700) Subject: target: Remove unneeded param pr_aptpl_buf_len to write_aptpl_to_file() X-Git-Tag: upstream/snapshot3+hdmi~4711^2~44 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4dee96fb366ec6b5b324c8d4fe9e04244cb32f5d;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git target: Remove unneeded param pr_aptpl_buf_len to write_aptpl_to_file() As mentioned in the comments in update_and_write_aptpl, write_aptpl_to_file() calls strlen() on the buffer, and the length was always being passed as zero. Signed-off-by: Andy Grover Signed-off-by: Nicholas Bellinger --- diff --git a/drivers/target/target_core_pr.c b/drivers/target/target_core_pr.c index 1573684..26c1f2d 100644 --- a/drivers/target/target_core_pr.c +++ b/drivers/target/target_core_pr.c @@ -1932,13 +1932,13 @@ out: */ static int __core_scsi3_write_aptpl_to_file( struct se_device *dev, - unsigned char *buf, - u32 pr_aptpl_buf_len) + unsigned char *buf) { struct t10_wwn *wwn = &dev->t10_wwn; struct file *file; int flags = O_RDWR | O_CREAT | O_TRUNC; char path[512]; + u32 pr_aptpl_buf_len; int ret; memset(path, 0, 512); @@ -1957,8 +1957,7 @@ static int __core_scsi3_write_aptpl_to_file( return PTR_ERR(file); } - if (!pr_aptpl_buf_len) - pr_aptpl_buf_len = (strlen(&buf[0]) + 1); /* Add extra for NULL */ + pr_aptpl_buf_len = (strlen(buf) + 1); /* Add extra for NULL */ ret = kernel_write(file, buf, pr_aptpl_buf_len, 0); @@ -1993,7 +1992,7 @@ core_scsi3_update_and_write_aptpl(struct se_device *dev, unsigned char *in_buf, * __core_scsi3_write_aptpl_to_file() will call strlen() * on the passed buf to determine pr_aptpl_buf_len. */ - return __core_scsi3_write_aptpl_to_file(dev, buf, 0); + return __core_scsi3_write_aptpl_to_file(dev, buf); } static sense_reason_t