Please pull from the for-linus branch:
git pull git://oss.sgi.com:8090/xfs/xfs-2.6.git for-linus
This will update the following files:
fs/xfs/linux-2.6/xfs_file.c | 4 ++--
fs/xfs/xfs_dir2_block.c | 6 ++----
fs/xfs/xfs_dir2_leaf.c | 2 +-
fs/xfs/xfs_dir2_sf.c | 9 +++------
fs/xfs/xfs_inode.c | 6 ++++--
5 files changed, 12 insertions(+), 15 deletions(-)
through these commits:
commit 041388b54ed95cd169546bd83bacd08ee32bd7ea
Author: Lachlan McIlroy <[email protected]>
Date: Tue Dec 18 16:19:34 2007 +1100
[XFS] Put the correct offset in dirent d_off
The recent filldir regression fix was not putting the correct d_off in
each dirent. This was resulting in incorrect cookies being passed to dmapi
ioctls and the wrong offset appearing in the dirents. readdir was
unaffected as the filp->f_pos was being updated with the correct offset
and this was being written into the last dirent in each buffer. Fix the
XFS code to do the right thing.
SGI-PV: 973746
SGI-Modid: xfs-linux-melb:xfs-kern:30240a
Signed-off-by: David Chinner <[email protected]>
Signed-off-by: Christoph Hellwig <[email protected]>
Signed-off-by: Lachlan McIlroy <[email protected]>
commit c734c79bc397eace039bea406997efa89f879c14
Author: Lachlan McIlroy <[email protected]>
Date: Tue Dec 18 16:17:41 2007 +1100
[XFS] Don't wait for pending I/Os when purging blocks beyond eof.
On last close of a file we purge blocks beyond eof. The same code is used
when we truncate the file size down. In this case we need to wait for any
pending I/Os for dirty pages beyond the new eof. For the last close case
we are not changing the file size and therefore do not need to wait for
any I/Os to complete. This fixes a performance bottleneck where writes
into the page cache and cache flushes can become mutually exclusive.
SGI-PV: 964002
SGI-Modid: xfs-linux-melb:xfs-kern:30220a
Signed-off-by: Lachlan McIlroy <[email protected]>
Signed-off-by: Peter Leckie <[email protected]>
On Tue, Dec 18, 2007 at 05:59:11PM +1100, Lachlan McIlroy wrote:
> Please pull from the for-linus branch:
> git pull git://oss.sgi.com:8090/xfs/xfs-2.6.git for-linus
Linus, please don't pull this yet. A problem has been found in
the dirent fix, and we've just fixed another mknod related regression
so we've got another couple of fixes still to go in XFS for 2.6.24.
Cheers,
Dave.
--
Dave Chinner
Principal Engineer
SGI Australian Software Group
On Wed, 19 Dec 2007, David Chinner wrote:
>
> On Tue, Dec 18, 2007 at 05:59:11PM +1100, Lachlan McIlroy wrote:
> > Please pull from the for-linus branch:
> > git pull git://oss.sgi.com:8090/xfs/xfs-2.6.git for-linus
>
> Linus, please don't pull this yet. A problem has been found in
> the dirent fix, and we've just fixed another mknod related regression
> so we've got another couple of fixes still to go in XFS for 2.6.24.
>
Too late, it's already long since pulled.
Linus
On Tue, Dec 18, 2007 at 05:19:04PM -0800, Linus Torvalds wrote:
>
>
> On Wed, 19 Dec 2007, David Chinner wrote:
> >
> > On Tue, Dec 18, 2007 at 05:59:11PM +1100, Lachlan McIlroy wrote:
> > > Please pull from the for-linus branch:
> > > git pull git://oss.sgi.com:8090/xfs/xfs-2.6.git for-linus
> >
> > Linus, please don't pull this yet. A problem has been found in
> > the dirent fix, and we've just fixed another mknod related regression
> > so we've got another couple of fixes still to go in XFS for 2.6.24.
>
> Too late, it's already long since pulled.
Ok, we'll just have to get the fixes to you ASAP.
Cheers,
Dave.
--
Dave Chinner
Principal Engineer
SGI Australian Software Group