aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorChen Gang <gang.chen@asianux.com>2013-11-03 09:23:39 -0500
committerJens Axboe <axboe@kernel.dk>2013-11-08 11:04:30 -0500
commitf8c5e94486671ffcac696886c246baa6ba89b5cf (patch)
tree9a4cf461b240740a0670cc364aec7851b3907ae1 /kernel
parent6678d83f18386eb103f8345024e52c5abe61725c (diff)
kernel: trace: blktrace: remove redundent memcpy() in compat_blk_trace_setup()
do_blk_trace_setup() will fully initialize 'buts.name', so can remove the related memcpy(). And also use BLKTRACE_BDEV_SIZE and ARRAY_SIZE instead of hard code number '32'. Signed-off-by: Chen Gang <gang.chen@asianux.com> Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/trace/blktrace.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/kernel/trace/blktrace.c b/kernel/trace/blktrace.c
index 7f727b34280d..f785aef65799 100644
--- a/kernel/trace/blktrace.c
+++ b/kernel/trace/blktrace.c
@@ -579,13 +579,12 @@ static int compat_blk_trace_setup(struct request_queue *q, char *name,
579 .end_lba = cbuts.end_lba, 579 .end_lba = cbuts.end_lba,
580 .pid = cbuts.pid, 580 .pid = cbuts.pid,
581 }; 581 };
582 memcpy(&buts.name, &cbuts.name, 32);
583 582
584 ret = do_blk_trace_setup(q, name, dev, bdev, &buts); 583 ret = do_blk_trace_setup(q, name, dev, bdev, &buts);
585 if (ret) 584 if (ret)
586 return ret; 585 return ret;
587 586
588 if (copy_to_user(arg, &buts.name, 32)) { 587 if (copy_to_user(arg, &buts.name, ARRAY_SIZE(buts.name))) {
589 blk_trace_remove(q); 588 blk_trace_remove(q);
590 return -EFAULT; 589 return -EFAULT;
591 } 590 }