Linus, please pull from
git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6.git for-linus
This will update the following files:
fs/jfs/acl.c | 8 -
fs/jfs/endian24.h | 2
fs/jfs/file.c | 8 -
fs/jfs/inode.c | 8 -
fs/jfs/jfs_acl.h | 8 -
fs/jfs/jfs_btree.h | 6 -
fs/jfs/jfs_debug.c | 6 -
fs/jfs/jfs_dinode.h | 8 -
fs/jfs/jfs_dmap.c | 180 +++++++++++++++---------------
fs/jfs/jfs_dmap.h | 28 ++--
fs/jfs/jfs_dtree.c | 18 +--
fs/jfs/jfs_dtree.h | 10 -
fs/jfs/jfs_extent.c | 42 +++----
fs/jfs/jfs_extent.h | 8 -
fs/jfs/jfs_filsys.h | 24 ++--
fs/jfs/jfs_imap.c | 222 +++++++++++++++++++-------------------
fs/jfs/jfs_imap.h | 14 +-
fs/jfs/jfs_incore.h | 8 -
fs/jfs/jfs_inode.c | 15 +-
fs/jfs/jfs_inode.h | 6 -
fs/jfs/jfs_lock.h | 10 -
fs/jfs/jfs_logmgr.c | 38 +++---
fs/jfs/jfs_logmgr.h | 76 ++++++-------
fs/jfs/jfs_metapage.c | 12 +-
fs/jfs/jfs_metapage.h | 8 -
fs/jfs/jfs_mount.c | 34 ++---
fs/jfs/jfs_superblock.h | 22 +--
fs/jfs/jfs_txnmgr.c | 8 -
fs/jfs/jfs_txnmgr.h | 12 +-
fs/jfs/jfs_umount.c | 24 ++--
fs/jfs/jfs_unicode.c | 12 +-
fs/jfs/jfs_unicode.h | 10 -
fs/jfs/jfs_uniupr.c | 8 -
fs/jfs/jfs_xattr.h | 2
fs/jfs/jfs_xtree.c | 12 +-
fs/jfs/jfs_xtree.h | 8 -
fs/jfs/namei.c | 67 +++++------
fs/jfs/resize.c | 6 -
fs/jfs/super.c | 12 +-
fs/jfs/symlink.c | 6 -
fs/jfs/xattr.c | 38 +++---
41 files changed, 525 insertions(+), 529 deletions(-)
through these ChangeSets:
Commit: 63f83c9fcf40ab61b75edf5d2f2c1ae6bf876482
Author: Dave Kleikamp <[email protected]> Mon, 02 Oct 2006 09:55:27 -0500
JFS: White space cleanup
Removed trailing spaces & tabs, and spaces preceding tabs.
Also a couple very minor comment cleanups.
Signed-off-by: Dave Kleikamp <[email protected]>
(cherry picked from f74156539964d7b3d5164fdf8848e6a682f75b97 commit)
Commit: 087387f90f577f5a0ab68d33ef326c9bb6d80dda
Author: Akinobu Mita <[email protected]> Thu, 14 Sep 2006 09:22:38 -0500
[PATCH] JFS: return correct error when i-node allocation failed
I have seen confusing behavior on JFS when I injected many intentional
slab allocation errors. The cp command failed with no disk space error
with enough disk space.
This patch makes:
- change the return value in case slab allocation failures happen
from -ENOSPC to -ENOMEM
- ialloc() return error code so that the caller can know the reason
of failures
Signed-off-by: Akinobu Mita <[email protected]>
Signed-off-by: Dave Kleikamp <[email protected]>
(cherry picked from 2b46f77976f798f3fe800809a1d0ed38763c71c8 commit)
Commit: 2a6968a9784551c216f9379a728d4104dbad98a8
Author: Tony Breeds <[email protected]> Mon, 11 Sep 2006 08:19:19 -0500
JFS: Remove shadow variable from fs/jfs/jfs_txnmgr.c:xtLog()
Signed-off-by: Tony Breeds <[email protected]>
Signed-off-by: Dave Kleikamp <[email protected]>
(cherry picked from bdc3d9e5af7d9c105be734dd7b5c3f1d9425a15a commit)
On Mon, 2 Oct 2006, Dave Kleikamp wrote:
>
> Signed-off-by: Dave Kleikamp <[email protected]>
> (cherry picked from f74156539964d7b3d5164fdf8848e6a682f75b97 commit)
Btw, these cherry-pick messages are useless (and just noise) when sending
to me, since nobody will likely ever see the private tree that you
cherry-picked from, so the SHA1 won't ever match anything meaningful for
anybody but you.
So please either edit it out by hand ("git cherry-pick -e") or just ask
git to not generate it at all (the "-r" flag, for "replay"). I thought git
had already been fixed to not do this by default, but maybe I was
dreaming.
Linus
On Mon, 2006-10-02 at 08:31 -0700, Linus Torvalds wrote:
>
> On Mon, 2 Oct 2006, Dave Kleikamp wrote:
> >
> > Signed-off-by: Dave Kleikamp <[email protected]>
> > (cherry picked from f74156539964d7b3d5164fdf8848e6a682f75b97 commit)
>
> Btw, these cherry-pick messages are useless (and just noise) when sending
> to me, since nobody will likely ever see the private tree that you
> cherry-picked from, so the SHA1 won't ever match anything meaningful for
> anybody but you.
>
> So please either edit it out by hand ("git cherry-pick -e") or just ask
> git to not generate it at all (the "-r" flag, for "replay"). I thought git
> had already been fixed to not do this by default, but maybe I was
> dreaming.
Okay. This is the first time I used cherry-pick. Since they were
generated by default, I left it alone. I'll eliminate them in the
future.
I'm running git-1.4.2.2, which is pretty darn recent, so it doesn't look
like the default has been fixed.
Thanks,
Shaggy
--
David Kleikamp
IBM Linux Technology Center
On Mon, Oct 02, 2006 at 10:41:15AM -0500, Dave Kleikamp wrote:
> Okay. This is the first time I used cherry-pick. Since they were
> generated by default, I left it alone. I'll eliminate them in the
> future.
>
> I'm running git-1.4.2.2, which is pretty darn recent, so it doesn't look
> like the default has been fixed.
No, it's still not a default; use -r