diff options
author | Eric Sandeen <sandeen@redhat.com> | 2013-01-31 13:21:12 -0500 |
---|---|---|
committer | Josef Bacik <jbacik@fusionio.com> | 2013-02-20 12:59:36 -0500 |
commit | de78b51a2852bddccd6535e9e12de65f92787a1e (patch) | |
tree | 199124b0e3bf96a1edbcd184eba34e0d8bffbe24 /fs/btrfs/ioctl.c | |
parent | e4a2bcaca9643e7430207810653222fc5187f2be (diff) |
btrfs: remove cache only arguments from defrag path
The entry point at the defrag ioctl always sets "cache only" to 0;
the codepaths haven't run for a long time as far as I can
tell. Chris says they're dead code, so remove them.
Signed-off-by: Eric Sandeen <sandeen@redhat.com>
Signed-off-by: Josef Bacik <jbacik@fusionio.com>
Diffstat (limited to 'fs/btrfs/ioctl.c')
-rw-r--r-- | fs/btrfs/ioctl.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c index 96ecefc1724f..daea831f3d36 100644 --- a/fs/btrfs/ioctl.c +++ b/fs/btrfs/ioctl.c | |||
@@ -818,7 +818,7 @@ static int find_new_extents(struct btrfs_root *root, | |||
818 | 818 | ||
819 | while(1) { | 819 | while(1) { |
820 | ret = btrfs_search_forward(root, &min_key, &max_key, | 820 | ret = btrfs_search_forward(root, &min_key, &max_key, |
821 | path, 0, newer_than); | 821 | path, newer_than); |
822 | if (ret != 0) | 822 | if (ret != 0) |
823 | goto none; | 823 | goto none; |
824 | if (min_key.objectid != ino) | 824 | if (min_key.objectid != ino) |
@@ -1864,7 +1864,7 @@ static noinline int search_ioctl(struct inode *inode, | |||
1864 | path->keep_locks = 1; | 1864 | path->keep_locks = 1; |
1865 | 1865 | ||
1866 | while(1) { | 1866 | while(1) { |
1867 | ret = btrfs_search_forward(root, &key, &max_key, path, 0, | 1867 | ret = btrfs_search_forward(root, &key, &max_key, path, |
1868 | sk->min_transid); | 1868 | sk->min_transid); |
1869 | if (ret != 0) { | 1869 | if (ret != 0) { |
1870 | if (ret > 0) | 1870 | if (ret > 0) |
@@ -2212,10 +2212,10 @@ static int btrfs_ioctl_defrag(struct file *file, void __user *argp) | |||
2212 | ret = -EPERM; | 2212 | ret = -EPERM; |
2213 | goto out; | 2213 | goto out; |
2214 | } | 2214 | } |
2215 | ret = btrfs_defrag_root(root, 0); | 2215 | ret = btrfs_defrag_root(root); |
2216 | if (ret) | 2216 | if (ret) |
2217 | goto out; | 2217 | goto out; |
2218 | ret = btrfs_defrag_root(root->fs_info->extent_root, 0); | 2218 | ret = btrfs_defrag_root(root->fs_info->extent_root); |
2219 | break; | 2219 | break; |
2220 | case S_IFREG: | 2220 | case S_IFREG: |
2221 | if (!(file->f_mode & FMODE_WRITE)) { | 2221 | if (!(file->f_mode & FMODE_WRITE)) { |