diff options
| author | David Sterba | 2012-06-22 14:30:39 +0200 |
|---|---|---|
| committer | Chris Mason | 2012-07-23 21:41:40 +0200 |
| commit | b27f7c0c150f74564b5d4c6c24a03c5226bf6327 (patch) | |
| tree | d26d8b2929a883783666836b9ec6808bdcb0f3fd /fs/btrfs/volumes.c | |
| parent | btrfs: ignore unfragmented file checks in defrag when compression enabled - r... (diff) | |
| download | kernel-qcow2-linux-b27f7c0c150f74564b5d4c6c24a03c5226bf6327.tar.gz kernel-qcow2-linux-b27f7c0c150f74564b5d4c6c24a03c5226bf6327.tar.xz kernel-qcow2-linux-b27f7c0c150f74564b5d4c6c24a03c5226bf6327.zip | |
btrfs: join DEV_STATS ioctls to one
Commit c11d2c236cc260b36 (Btrfs: add ioctl to get and reset the device
stats) introduced two ioctls doing almost the same thing distinguished
by just the ioctl number which encodes "do reset after read". I have
suggested
http://www.mail-archive.com/linux-btrfs@vger.kernel.org/msg16604.html
to implement it via the ioctl args. This hasn't happen, and I think we
should use a more clean way to pass flags and should not waste ioctl
numbers.
CC: Stefan Behrens <sbehrens@giantdisaster.de>
Signed-off-by: David Sterba <dsterba@suse.cz>
Diffstat (limited to 'fs/btrfs/volumes.c')
| -rw-r--r-- | fs/btrfs/volumes.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c index ecaad40e7ef4..957bf393ab46 100644 --- a/fs/btrfs/volumes.c +++ b/fs/btrfs/volumes.c @@ -4890,8 +4890,7 @@ static void btrfs_dev_stat_print_on_load(struct btrfs_device *dev) } int btrfs_get_dev_stats(struct btrfs_root *root, - struct btrfs_ioctl_get_dev_stats *stats, - int reset_after_read) + struct btrfs_ioctl_get_dev_stats *stats) { struct btrfs_device *dev; struct btrfs_fs_devices *fs_devices = root->fs_info->fs_devices; @@ -4909,7 +4908,7 @@ int btrfs_get_dev_stats(struct btrfs_root *root, printk(KERN_WARNING "btrfs: get dev_stats failed, not yet valid\n"); return -ENODEV; - } else if (reset_after_read) { + } else if (stats->flags & BTRFS_DEV_STATS_RESET) { for (i = 0; i < BTRFS_DEV_STAT_VALUES_MAX; i++) { if (stats->nr_items > i) stats->values[i] = |