mirrors/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2025-11-04 02:30:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

blktrace: remove sysfs_blk_trace_enable_show/store()

Browse source 
sysfs_blk_trace_enable_show()/store() share most of code with
sysfs_blk_trace_attr_show()/store().

Signed-off-by: Li Zefan <lizf@cn.fujitsu.com>
Acked-by: Frederic Weisbecker <fweisbec@gmail.com>
Acked-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Jens Axboe <jens.axboe@oracle.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
LKML-Reference: <49C30EA3.1060004@cn.fujitsu.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Li Zefan 2009-03-20 11:33:55 +08:00 committed by Ingo Molnar
parent 15152e448b
commit cd649b8bb8
1 changed files with 22 additions and 70 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

92
kernel/trace/blktrace.c
View file

@ -1284,72 +1284,6 @@ static int blk_trace_setup_queue(struct request_queue *q, dev_t dev)
* sysfs interface to enable and configure tracing * sysfs interface to enable and configure tracing
*/ */
static ssize_t sysfs_blk_trace_enable_show(struct device *dev,
struct device_attribute *attr,
char *buf)
{
struct hd_struct *p = dev_to_part(dev);
struct block_device *bdev;
ssize_t ret = -ENXIO;
lock_kernel();
bdev = bdget(part_devt(p));
if (bdev != NULL) {
struct request_queue *q = bdev_get_queue(bdev);
if (q != NULL) {
mutex_lock(&bdev->bd_mutex);
ret = sprintf(buf, "%u\n", !!q->blk_trace);
mutex_unlock(&bdev->bd_mutex);
}
bdput(bdev);
}
unlock_kernel();
return ret;
}
static ssize_t sysfs_blk_trace_enable_store(struct device *dev,
struct device_attribute *attr,
const char *buf, size_t count)
{
struct block_device *bdev;
struct request_queue *q;
struct hd_struct *p;
int value;
ssize_t ret = -ENXIO;
if (count == 0 || sscanf(buf, "%d", &value) != 1)
goto out;
lock_kernel();
p = dev_to_part(dev);
bdev = bdget(part_devt(p));
if (bdev == NULL)
goto out_unlock_kernel;
q = bdev_get_queue(bdev);
if (q == NULL)
goto out_bdput;
mutex_lock(&bdev->bd_mutex);
if (value)
ret = blk_trace_setup_queue(q, bdev->bd_dev);
else
ret = blk_trace_remove_queue(q);
mutex_unlock(&bdev->bd_mutex);
if (ret == 0)
ret = count;
out_bdput:
bdput(bdev);
out_unlock_kernel:
unlock_kernel();
out:
return ret;
}
static ssize_t sysfs_blk_trace_attr_show(struct device *dev, static ssize_t sysfs_blk_trace_attr_show(struct device *dev,
struct device_attribute *attr, struct device_attribute *attr,
char *buf); char *buf);
@ -1361,8 +1295,7 @@ static ssize_t sysfs_blk_trace_attr_store(struct device *dev,
sysfs_blk_trace_attr_show, \ sysfs_blk_trace_attr_show, \
sysfs_blk_trace_attr_store) sysfs_blk_trace_attr_store)
static DEVICE_ATTR(enable, S_IRUGO | S_IWUSR, static BLK_TRACE_DEVICE_ATTR(enable);
sysfs_blk_trace_enable_show, sysfs_blk_trace_enable_store);
static BLK_TRACE_DEVICE_ATTR(act_mask); static BLK_TRACE_DEVICE_ATTR(act_mask);
static BLK_TRACE_DEVICE_ATTR(pid); static BLK_TRACE_DEVICE_ATTR(pid);
static BLK_TRACE_DEVICE_ATTR(start_lba); static BLK_TRACE_DEVICE_ATTR(start_lba);
@ -1447,6 +1380,12 @@ static ssize_t sysfs_blk_trace_attr_show(struct device *dev,
if (q == NULL) if (q == NULL)
goto out_bdput; goto out_bdput;
mutex_lock(&bdev->bd_mutex); mutex_lock(&bdev->bd_mutex);
if (attr == &dev_attr_enable) {
ret = sprintf(buf, "%u\n", !!q->blk_trace);
goto out_unlock_bdev;
}
if (q->blk_trace == NULL) if (q->blk_trace == NULL)
ret = sprintf(buf, "disabled\n"); ret = sprintf(buf, "disabled\n");
else if (attr == &dev_attr_act_mask) else if (attr == &dev_attr_act_mask)
@ -1457,6 +1396,8 @@ static ssize_t sysfs_blk_trace_attr_show(struct device *dev,
ret = sprintf(buf, "%llu\n", q->blk_trace->start_lba); ret = sprintf(buf, "%llu\n", q->blk_trace->start_lba);
else if (attr == &dev_attr_end_lba) else if (attr == &dev_attr_end_lba)
ret = sprintf(buf, "%llu\n", q->blk_trace->end_lba); ret = sprintf(buf, "%llu\n", q->blk_trace->end_lba);
out_unlock_bdev:
mutex_unlock(&bdev->bd_mutex); mutex_unlock(&bdev->bd_mutex);
out_bdput: out_bdput:
bdput(bdev); bdput(bdev);
@ -1499,6 +1440,15 @@ static ssize_t sysfs_blk_trace_attr_store(struct device *dev,
goto out_bdput; goto out_bdput;
mutex_lock(&bdev->bd_mutex); mutex_lock(&bdev->bd_mutex);
if (attr == &dev_attr_enable) {
if (value)
ret = blk_trace_setup_queue(q, bdev->bd_dev);
else
ret = blk_trace_remove_queue(q);
goto out_unlock_bdev;
}
ret = 0; ret = 0;
if (q->blk_trace == NULL) if (q->blk_trace == NULL)
ret = blk_trace_setup_queue(q, bdev->bd_dev); ret = blk_trace_setup_queue(q, bdev->bd_dev);
@ -1512,13 +1462,15 @@ static ssize_t sysfs_blk_trace_attr_store(struct device *dev,
q->blk_trace->start_lba = value; q->blk_trace->start_lba = value;
else if (attr == &dev_attr_end_lba) else if (attr == &dev_attr_end_lba)
q->blk_trace->end_lba = value; q->blk_trace->end_lba = value;
ret = count;
} }
out_unlock_bdev:
mutex_unlock(&bdev->bd_mutex); mutex_unlock(&bdev->bd_mutex);
out_bdput: out_bdput:
bdput(bdev); bdput(bdev);
out_unlock_kernel: out_unlock_kernel:
unlock_kernel(); unlock_kernel();
out: out:
return ret; return ret ? ret : count;
} }