2015-04-03 19:50:44

by Fabian Frédérick

Subject: [PATCH V2 linux-next] Btrfs: use BTRFS_COMPRESS_NONE instead of 0

cow_file_range_inline() was called with 0 instead of actual definition.

btrfs_finish_ordered_io() initialized compress_type with 0 as well.
(Thanks to David Sterba for suggesting this update).

Signed-off-by: Fabian Frederick <[email protected]>
---

V2: also replace 0 in btrfs_finish_ordered_io()

fs/btrfs/inode.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index 5b6fbae..2f064d7 100644
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -524,7 +524,8 @@ cont:
* to make an uncompressed inline extent.
*/
ret = cow_file_range_inline(root, inode, start, end,
- 0, 0, NULL);
+ 0, BTRFS_COMPRESS_NONE,
+ NULL);
} else {
/* try making a compressed inline extent */
ret = cow_file_range_inline(root, inode, start, end,
@@ -943,8 +944,8 @@ static noinline int cow_file_range(struct inode *inode,

if (start == 0) {
/* lets try to make an inline extent */
- ret = cow_file_range_inline(root, inode, start, end, 0, 0,
- NULL);
+ ret = cow_file_range_inline(root, inode, start, end, 0,
+ BTRFS_COMPRESS_NONE, NULL);
if (ret == 0) {
extent_clear_unlock_delalloc(inode, start, end, NULL,
EXTENT_LOCKED | EXTENT_DELALLOC |
@@ -2793,7 +2794,7 @@ static int btrfs_finish_ordered_io(struct btrfs_ordered_extent *ordered_extent)
struct extent_io_tree *io_tree = &BTRFS_I(inode)->io_tree;
struct extent_state *cached_state = NULL;
struct new_sa_defrag_extent *new = NULL;
- int compress_type = 0;
+ int compress_type = BTRFS_COMPRESS_NONE;
int ret = 0;
u64 logical_len = ordered_extent->len;
bool nolock;
--
1.9.1

2015-04-07 14:20:32

by David Sterba

Subject: Re: [PATCH V2 linux-next] Btrfs: use BTRFS_COMPRESS_NONE instead of 0

On Fri, Apr 03, 2015 at 09:50:34PM +0200, Fabian Frederick wrote:
> cow_file_range_inline() was called with 0 instead of actual definition.
>
> btrfs_finish_ordered_io() initialized compress_type with 0 as well.
> (Thanks to David Sterba for suggesting this update).
>
> Signed-off-by: Fabian Frederick <[email protected]>

Reviewed-by: David Sterba <[email protected]>

Thanks.