diff options
| author | Chris Mason <clm@fb.com> | 2015-12-24 00:10:26 +0300 |
|---|---|---|
| committer | Chris Mason <clm@fb.com> | 2015-12-24 00:10:26 +0300 |
| commit | afa427cf9d6ef64e73df68882cbabde0e6a61639 (patch) | |
| tree | de7f14f859f1dd6bbb7c66adfb138f8feaf87f65 /fs/btrfs/ctree.h | |
| parent | 4ef7675344d687a0ef5b0d7c0cee12da005870c0 (diff) | |
| parent | 35de6db28f260e88e9acc47305f7b3f272d76cbf (diff) | |
| download | linux-afa427cf9d6ef64e73df68882cbabde0e6a61639.tar.xz | |
Merge branch 'cleanup/misc-simplify' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux into for-linus-4.5
Diffstat (limited to 'fs/btrfs/ctree.h')
| -rw-r--r-- | fs/btrfs/ctree.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h index 35489e7129a7..d8d3dd468d6d 100644 --- a/fs/btrfs/ctree.h +++ b/fs/btrfs/ctree.h @@ -3906,7 +3906,6 @@ void btrfs_extent_item_to_extent_map(struct inode *inode, /* inode.c */ struct btrfs_delalloc_work { struct inode *inode; - int wait; int delay_iput; struct completion completion; struct list_head list; @@ -3914,7 +3913,7 @@ struct btrfs_delalloc_work { }; struct btrfs_delalloc_work *btrfs_alloc_delalloc_work(struct inode *inode, - int wait, int delay_iput); + int delay_iput); void btrfs_wait_and_free_delalloc_work(struct btrfs_delalloc_work *work); struct extent_map *btrfs_get_extent_fiemap(struct inode *inode, struct page *page, |