diff options
author | Chris Mason <clm@fb.com> | 2014-02-14 16:42:13 -0500 |
---|---|---|
committer | Chris Mason <clm@fb.com> | 2014-02-14 16:42:13 -0500 |
commit | 11bcac89c0d73dea42f1cb8646b532035796a5d6 (patch) | |
tree | 523e8bb6b78613b0486c07e2359a4867277518b3 /fs | |
parent | a2aa75e18a21b21952dc6daa9bac7c9f4426f81f (diff) |
Revert "btrfs: add ioctl to export size of global metadata reservation"
This reverts commit 01e219e8069516cdb98594d417b8bb8d906ed30d.
David Sterba found a different way to provide these features without adding a new
ioctl. We haven't released any progs with this ioctl yet, so I'm taking this out
for now until we finalize things.
Signed-off-by: Chris Mason <clm@fb.com>
Signed-off-by: David Sterba <dsterba@suse.cz>
CC: Jeff Mahoney <jeffm@suse.com>
Diffstat (limited to 'fs')
-rw-r--r-- | fs/btrfs/ioctl.c | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c index ebdd866d4cfd..9a9044585da7 100644 --- a/fs/btrfs/ioctl.c +++ b/fs/btrfs/ioctl.c | |||
@@ -3559,20 +3559,6 @@ out: | |||
3559 | return ret; | 3559 | return ret; |
3560 | } | 3560 | } |
3561 | 3561 | ||
3562 | static long btrfs_ioctl_global_rsv(struct btrfs_root *root, void __user *arg) | ||
3563 | { | ||
3564 | struct btrfs_block_rsv *block_rsv = &root->fs_info->global_block_rsv; | ||
3565 | u64 reserved; | ||
3566 | |||
3567 | spin_lock(&block_rsv->lock); | ||
3568 | reserved = block_rsv->reserved; | ||
3569 | spin_unlock(&block_rsv->lock); | ||
3570 | |||
3571 | if (arg && copy_to_user(arg, &reserved, sizeof(reserved))) | ||
3572 | return -EFAULT; | ||
3573 | return 0; | ||
3574 | } | ||
3575 | |||
3576 | /* | 3562 | /* |
3577 | * there are many ways the trans_start and trans_end ioctls can lead | 3563 | * there are many ways the trans_start and trans_end ioctls can lead |
3578 | * to deadlocks. They should only be used by applications that | 3564 | * to deadlocks. They should only be used by applications that |
@@ -4779,8 +4765,6 @@ long btrfs_ioctl(struct file *file, unsigned int | |||
4779 | return btrfs_ioctl_logical_to_ino(root, argp); | 4765 | return btrfs_ioctl_logical_to_ino(root, argp); |
4780 | case BTRFS_IOC_SPACE_INFO: | 4766 | case BTRFS_IOC_SPACE_INFO: |
4781 | return btrfs_ioctl_space_info(root, argp); | 4767 | return btrfs_ioctl_space_info(root, argp); |
4782 | case BTRFS_IOC_GLOBAL_RSV: | ||
4783 | return btrfs_ioctl_global_rsv(root, argp); | ||
4784 | case BTRFS_IOC_SYNC: { | 4768 | case BTRFS_IOC_SYNC: { |
4785 | int ret; | 4769 | int ret; |
4786 | 4770 | ||