summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-06-16 12:23:52 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-06-16 12:23:52 -0700
commitcd5232bd6be2d215a800f3d88c287ca791debfbe (patch)
tree7a91e7d4bc5312cc61e7003abd383d8de1f0f9aa /fs
parent300df7dc89cc276377fc020704e34875d5c473b6 (diff)
parentf7c52fd17a7dda42fc9e88c2b2678403419bfe63 (diff)
downloadop-kernel-dev-cd5232bd6be2d215a800f3d88c287ca791debfbe.zip
op-kernel-dev-cd5232bd6be2d215a800f3d88c287ca791debfbe.tar.gz
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
Diffstat (limited to 'fs')
-rw-r--r--fs/jfs/jfs_extent.c1
1 files changed, 1 insertions, 0 deletions
diff --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.
OpenPOWER on IntegriCloud