diff options
| author | Chris Mason <clm@fb.com> | 2016-01-27 05:48:23 -0800 |
|---|---|---|
| committer | Chris Mason <clm@fb.com> | 2016-01-27 05:48:23 -0800 |
| commit | d32a4e34348869a273a01139112a13fc6870f003 (patch) | |
| tree | 507adf3bf14d2cafb38502c27ea8cc82b28cf11a /fs/btrfs/tests/inode-tests.c | |
| parent | bf6092066f80840410e3401cd962b23d54a95713 (diff) | |
| parent | 3e4c5efbb3ac7c9c4fb5f33b659fa98afe568ab1 (diff) | |
| download | linux-stable-d32a4e34348869a273a01139112a13fc6870f003.tar.gz linux-stable-d32a4e34348869a273a01139112a13fc6870f003.tar.bz2 linux-stable-d32a4e34348869a273a01139112a13fc6870f003.zip | |
Merge branch 'dev/fst-followup' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux into for-linus-4.5
Diffstat (limited to 'fs/btrfs/tests/inode-tests.c')
| -rw-r--r-- | fs/btrfs/tests/inode-tests.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/btrfs/tests/inode-tests.c b/fs/btrfs/tests/inode-tests.c index 5de55fdd28bc..e2d3da02deee 100644 --- a/fs/btrfs/tests/inode-tests.c +++ b/fs/btrfs/tests/inode-tests.c @@ -974,7 +974,7 @@ static int test_extent_accounting(void) (BTRFS_MAX_EXTENT_SIZE >> 1) + 4095, EXTENT_DELALLOC | EXTENT_DIRTY | EXTENT_UPTODATE | EXTENT_DO_ACCOUNTING, 0, 0, - NULL, GFP_NOFS); + NULL, GFP_KERNEL); if (ret) { test_msg("clear_extent_bit returned %d\n", ret); goto out; @@ -1045,7 +1045,7 @@ static int test_extent_accounting(void) BTRFS_MAX_EXTENT_SIZE+8191, EXTENT_DIRTY | EXTENT_DELALLOC | EXTENT_DO_ACCOUNTING | EXTENT_UPTODATE, 0, 0, - NULL, GFP_NOFS); + NULL, GFP_KERNEL); if (ret) { test_msg("clear_extent_bit returned %d\n", ret); goto out; @@ -1079,7 +1079,7 @@ static int test_extent_accounting(void) ret = clear_extent_bit(&BTRFS_I(inode)->io_tree, 0, (u64)-1, EXTENT_DIRTY | EXTENT_DELALLOC | EXTENT_DO_ACCOUNTING | EXTENT_UPTODATE, 0, 0, - NULL, GFP_NOFS); + NULL, GFP_KERNEL); if (ret) { test_msg("clear_extent_bit returned %d\n", ret); goto out; @@ -1096,7 +1096,7 @@ out: clear_extent_bit(&BTRFS_I(inode)->io_tree, 0, (u64)-1, EXTENT_DIRTY | EXTENT_DELALLOC | EXTENT_DO_ACCOUNTING | EXTENT_UPTODATE, 0, 0, - NULL, GFP_NOFS); + NULL, GFP_KERNEL); iput(inode); btrfs_free_dummy_root(root); return ret; |