projects/linux·commit cd5232bd

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6

cd5232bd · Linus Torvalds <[email protected]> · 2009-06-16 12:23:52 -07:00

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6:
  jfs: fix regression preventing coalescing of extents
Commit
cd5232bd6be2d215a800f3d88c287ca791debfbe
Parents
300df7dc · f7c52fd1

Merge commit. Changes below are compared with the first parent: 300df7dc.

Changes

1 files changed · +1 −0

FileStatusAddDelContent
fs/jfs/jfs_extent.cmodified+1−0View file

fs/jfs/jfs_extent.c

View file
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.