Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6
Merge commit. Changes below are compared with the first parent: 300df7dc.
Changes
1 files changed · +1 −0
| File | Status | Add | Del | Content |
|---|---|---|---|---|
| fs/jfs/jfs_extent.c | modified | +1 | −0 | View file |
fs/jfs/jfs_extent.c
View filediff --git a/fs/jfs/jfs_extent.c b/fs/jfs/jfs_extent.c
index bbbd5f2..41d6045 100644
--- a/fs/jfs/jfs_extent.c
+++ b/fs/jfs/jfs_extent.c
@@ -391,6 +391,7 @@ int extHint(struct inode *ip, s64 offset, xad_t * xp)
}
XADaddress(xp, xaddr);
XADlength(xp, xlen);
+ XADoffset(xp, prev);
/*
* only preserve the abnr flag within the xad flags
* of the returned hint.