diff options
| author | Chris Mason <clm@fb.com> | 2015-10-22 03:21:40 +0200 |
|---|---|---|
| committer | Chris Mason <clm@fb.com> | 2015-10-22 03:21:40 +0200 |
| commit | a0d58e48db58801a0e764e9b9c87e1782d390fcb (patch) | |
| tree | f413f86da859552a29df58f40d450372977b5673 /fs/btrfs/inode.c | |
| parent | Merge branch 'fix/waitqueue-barriers' of git://git.kernel.org/pub/scm/linux/k... (diff) | |
| parent | btrfs: reada: Fix returned errno code (diff) | |
| download | linux-a0d58e48db58801a0e764e9b9c87e1782d390fcb.tar.xz linux-a0d58e48db58801a0e764e9b9c87e1782d390fcb.zip | |
Merge branch 'cleanups/for-4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux into for-linus-4.4
Diffstat (limited to 'fs/btrfs/inode.c')
| -rw-r--r-- | fs/btrfs/inode.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 208db4e835f0..8161afc32fa0 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -1864,15 +1864,15 @@ static int btrfs_submit_bio_hook(struct inode *inode, int rw, struct bio *bio, u64 bio_offset) { struct btrfs_root *root = BTRFS_I(inode)->root; + enum btrfs_wq_endio_type metadata = BTRFS_WQ_ENDIO_DATA; int ret = 0; int skip_sum; - int metadata = 0; int async = !atomic_read(&BTRFS_I(inode)->sync_writers); skip_sum = BTRFS_I(inode)->flags & BTRFS_INODE_NODATASUM; if (btrfs_is_free_space_inode(inode)) - metadata = 2; + metadata = BTRFS_WQ_ENDIO_FREE_SPACE; if (!(rw & REQ_WRITE)) { ret = btrfs_bio_wq_end_io(root->fs_info, bio, metadata); @@ -2602,7 +2602,6 @@ static void free_sa_defrag_extent(struct new_sa_defrag_extent *new) return; list_for_each_entry_safe(old, tmp, &new->head, list) { - list_del(&old->list); kfree(old); } kfree(new); |