diff options
| author | David Sterba <dsterba@suse.com> | 2016-05-25 22:51:03 +0200 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2016-05-25 22:51:03 +0200 |
| commit | 42f31734eb7658fd01fb186d56312be869450a42 (patch) | |
| tree | b2fb549b9549bead4d2837c81760cf87fa50ad43 /fs/btrfs/transaction.c | |
| parent | Merge branch 'misc-4.7' into for-chris-4.7-20160525 (diff) | |
| parent | btrfs: fix string and comment grammatical issues and typos (diff) | |
| download | linux-42f31734eb7658fd01fb186d56312be869450a42.tar.xz linux-42f31734eb7658fd01fb186d56312be869450a42.zip | |
Merge branch 'cleanups-4.7' into for-chris-4.7-20160525
Diffstat (limited to 'fs/btrfs/transaction.c')
| -rw-r--r-- | fs/btrfs/transaction.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/btrfs/transaction.c b/fs/btrfs/transaction.c index 5b0b758a3f79..f6e24cb423ae 100644 --- a/fs/btrfs/transaction.c +++ b/fs/btrfs/transaction.c @@ -944,7 +944,7 @@ int btrfs_write_marked_extents(struct btrfs_root *root, err = convert_extent_bit(dirty_pages, start, end, EXTENT_NEED_WAIT, - mark, &cached_state, GFP_NOFS); + mark, &cached_state); /* * convert_extent_bit can return -ENOMEM, which is most of the * time a temporary error. So when it happens, ignore the error |