diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-04-28 04:38:34 (GMT) |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-04-28 04:38:34 (GMT) |
commit | 37aa48368f2508defb1976be62e1ed6ca4dde683 (patch) | |
tree | 59b606c740ddd10259fbf2248bb50498a319fa6d /fs/ext4/extents_status.c | |
parent | 1da4f83c0c43f25baf356c4cc719255877da6b1e (diff) | |
parent | d1db0eea852497762cab43b905b879dfcd3b8987 (diff) | |
download | linux-37aa48368f2508defb1976be62e1ed6ca4dde683.tar.xz |
Merge 3.15-rc3 into staging-next
Diffstat (limited to 'fs/ext4/extents_status.c')
-rw-r--r-- | fs/ext4/extents_status.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ext4/extents_status.c b/fs/ext4/extents_status.c index 0a014a7..0ebc212 100644 --- a/fs/ext4/extents_status.c +++ b/fs/ext4/extents_status.c @@ -810,7 +810,7 @@ retry: newes.es_lblk = end + 1; newes.es_len = len2; - block = 0x7FDEADBEEF; + block = 0x7FDEADBEEFULL; if (ext4_es_is_written(&orig_es) || ext4_es_is_unwritten(&orig_es)) block = ext4_es_pblock(&orig_es) + |