git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'kvm-s390-next-4.14-2' of git://git.kernel.org/pub/scm/linux/kernel/git...
[sfrench/cifs-2.6.git]
/
fs
/
ext4
/
extents.c
diff --git
a/fs/ext4/extents.c
b/fs/ext4/extents.c
index 230ca74c48415a3afeebdbf98d27e9fdd241b1eb..97f0fd06728d7bb18bb05637db169cfeb91f9bcf 100644
(file)
--- a/
fs/ext4/extents.c
+++ b/
fs/ext4/extents.c
@@
-5836,7
+5836,7
@@
ext4_swap_extents(handle_t *handle, struct inode *inode1,
if (e1_blk > lblk1)
next1 = e1_blk;
if (e2_blk > lblk2)
- next2 = e
1
_blk;
+ next2 = e
2
_blk;
/* Do we have something to swap */
if (next1 == EXT_MAX_BLOCKS || next2 == EXT_MAX_BLOCKS)
goto finish;