|
@@ -842,7 +842,6 @@ static int find_new_extents(struct btrfs_root *root,
|
|
|
{
|
|
|
struct btrfs_path *path;
|
|
|
struct btrfs_key min_key;
|
|
|
- struct btrfs_key max_key;
|
|
|
struct extent_buffer *leaf;
|
|
|
struct btrfs_file_extent_item *extent;
|
|
|
int type;
|
|
@@ -857,15 +856,10 @@ static int find_new_extents(struct btrfs_root *root,
|
|
|
min_key.type = BTRFS_EXTENT_DATA_KEY;
|
|
|
min_key.offset = *off;
|
|
|
|
|
|
- max_key.objectid = ino;
|
|
|
- max_key.type = (u8)-1;
|
|
|
- max_key.offset = (u64)-1;
|
|
|
-
|
|
|
path->keep_locks = 1;
|
|
|
|
|
|
while(1) {
|
|
|
- ret = btrfs_search_forward(root, &min_key, &max_key,
|
|
|
- path, newer_than);
|
|
|
+ ret = btrfs_search_forward(root, &min_key, path, newer_than);
|
|
|
if (ret != 0)
|
|
|
goto none;
|
|
|
if (min_key.objectid != ino)
|
|
@@ -1893,7 +1887,6 @@ static noinline int search_ioctl(struct inode *inode,
|
|
|
{
|
|
|
struct btrfs_root *root;
|
|
|
struct btrfs_key key;
|
|
|
- struct btrfs_key max_key;
|
|
|
struct btrfs_path *path;
|
|
|
struct btrfs_ioctl_search_key *sk = &args->key;
|
|
|
struct btrfs_fs_info *info = BTRFS_I(inode)->root->fs_info;
|
|
@@ -1925,15 +1918,10 @@ static noinline int search_ioctl(struct inode *inode,
|
|
|
key.type = sk->min_type;
|
|
|
key.offset = sk->min_offset;
|
|
|
|
|
|
- max_key.objectid = sk->max_objectid;
|
|
|
- max_key.type = sk->max_type;
|
|
|
- max_key.offset = sk->max_offset;
|
|
|
-
|
|
|
path->keep_locks = 1;
|
|
|
|
|
|
while(1) {
|
|
|
- ret = btrfs_search_forward(root, &key, &max_key, path,
|
|
|
- sk->min_transid);
|
|
|
+ ret = btrfs_search_forward(root, &key, path, sk->min_transid);
|
|
|
if (ret != 0) {
|
|
|
if (ret > 0)
|
|
|
ret = 0;
|