Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6: jfs: fix regression preventing coalescing of extents
This commit is contained in:
commit
cd5232bd6b
|
@ -391,6 +391,7 @@ int extHint(struct inode *ip, s64 offset, xad_t * xp)
|
||||||
}
|
}
|
||||||
XADaddress(xp, xaddr);
|
XADaddress(xp, xaddr);
|
||||||
XADlength(xp, xlen);
|
XADlength(xp, xlen);
|
||||||
|
XADoffset(xp, prev);
|
||||||
/*
|
/*
|
||||||
* only preserve the abnr flag within the xad flags
|
* only preserve the abnr flag within the xad flags
|
||||||
* of the returned hint.
|
* of the returned hint.
|
||||||
|
|
Loading…
Reference in New Issue