* [GIT PULL] jfs update
@ 2009-07-23 18:27 shaggy
0 siblings, 0 replies; 48+ messages in thread
From: shaggy @ 2009-07-23 18:27 UTC (permalink / raw)
To: torvalds; +Cc: akpm, linux-kernel
Linus, please pull from
git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6.git for-linus
This fixes a regression from 2.6.30 and will update the following files:
fs/jfs/acl.c | 4 +---
1 files changed, 1 insertions(+), 3 deletions(-)
through this ChangeSet:
commit 4a19fb11a90fdbbcb3bc02effa036230d035ca28
Author: Stefan Bader <stefan.bader@canonical.com>
Date: Thu Jul 23 11:26:05 2009 +0200
jfs: Fix early release of acl in jfs_get_acl
BugLink: http://bugs.launchpad.net/ubuntu/+bug/396780
Commit 073aaa1b142461d91f83da66db1184d7c1b1edea "helpers for acl
caching + switch to those" introduced new helper functions for
acl handling but seems to have introduced a regression for jfs as
the acl is released before returning it to the caller, instead of
leaving this for the caller to do.
This causes the acl object to be used after freeing it, leading
to kernel panics in completely different places.
Thanks to Christophe Dumez for reporting and bisecting into this.
Reported-by: Christophe Dumez <dchris@gmail.com>
Tested-by: Christophe Dumez <dchris@gmail.com>
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
Acked-by: Andy Whitcroft <apw@canonical.com>
Signed-off-by: Dave Kleikamp <shaggy@linux.vnet.ibm.com>
^ permalink raw reply [flat|nested] 48+ messages in thread
* [GIT PULL] jfs update
@ 2011-07-27 14:55 Dave Kleikamp
0 siblings, 0 replies; 48+ messages in thread
From: Dave Kleikamp @ 2011-07-27 14:55 UTC (permalink / raw)
To: Linus Torvalds, Andrew Morton; +Cc: linux-kernel
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/jfs_dmap.c | 5 +----
fs/jfs/jfs_txnmgr.c | 6 ++----
fs/jfs/namei.c | 3 +--
3 files changed, 4 insertions(+), 10 deletions(-)
through this ChangeSet:
commit 7c6f49b9de29a8f60aa985a114cbd20687773247
Author: Dave Kleikamp <dave.kleikamp@oracle.com>
Date: Mon Jun 20 13:00:27 2011 -0500
jfs: clean up some compiler warnings
jfs has a few variables being set but never used.
Signed-off-by: Dave Kleikamp <dave.kleikamp@oracle.com>
^ permalink raw reply [flat|nested] 48+ messages in thread
* [GIT PULL] jfs update
@ 2010-04-21 12:42 shaggy
0 siblings, 0 replies; 48+ messages in thread
From: shaggy @ 2010-04-21 12:42 UTC (permalink / raw)
To: torvalds; +Cc: akpm, linux-kernel
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain, Size: 1883 bytes --]
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/inode.c | 2 +-
fs/jfs/jfs_dmap.c | 16 ++++++++--------
fs/jfs/jfs_dmap.h | 6 +++---
fs/jfs/jfs_inode.h | 1 +
fs/jfs/namei.c | 4 ++--
fs/jfs/resize.c | 6 +++++-
fs/jfs/symlink.c | 14 +++++++++++++-
7 files changed, 33 insertions(+), 16 deletions(-)
through these ChangeSets:
commit c7f2e1f0ac142a657a1de00d404e1c8345b20598
Author: Dmitry Monakhov <dmonakhov@openvz.org>
Date: Fri Apr 16 08:05:50 2010 -0500
jfs: add jfs specific ->setattr call
generic setattr not longer responsible for quota transfer.
use jfs_setattr for all jfs's inodes.
Signed-off-by: Dmitry Monakhov <dmonakhov@openvz.org>
Signed-off-by: Dave Kleikamp <shaggy@linux.vnet.ibm.com>
commit 2b0b39517d1af5294128dbc2fd7ed39c8effa540
Author: Bill Pemberton <wfp5p@virginia.edu>
Date: Fri Apr 16 08:01:20 2010 -0500
jfs: fix diAllocExt error in resizing filesystem
Resizing the filesystem would result in an diAllocExt error in some
instances because changes in bmp->db_agsize would not get noticed if
goto extendBmap was called.
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Dave Kleikamp <shaggy@linux.vnet.ibm.com>
Cc: jfs-discussion@lists.sourceforge.net
Cc: linux-kernel@vger.kernel.org
commit d7eecb483cc29e929bbc5515b8def830d7fc6ad2
Author: Daniel Mack <daniel@caiaq.de>
Date: Thu Jan 28 16:13:01 2010 +0800
jfs_dmap.[ch]: trivial typo fix: s/heigth/height/g
Signed-off-by: Daniel Mack <daniel@caiaq.de>
Signed-off-by: Dave Kleikamp <shaggy@linux.vnet.ibm.com>
Cc: Jiri Kosina <trivial@kernel.org>
Cc: André Goddard Rosa <andre.goddard@gmail.com>
Cc: jfs-discussion@lists.sourceforge.net
^ permalink raw reply [flat|nested] 48+ messages in thread
* [GIT PULL] jfs update
@ 2009-06-16 19:14 shaggy
0 siblings, 0 replies; 48+ messages in thread
From: shaggy @ 2009-06-16 19:14 UTC (permalink / raw)
To: torvalds; +Cc: akpm, linux-kernel
Linus, please pull from
git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6.git for-linus
This fixes a regression introduced in 2.6.30. I'll send it to stable as well.
This will update the following files:
fs/jfs/jfs_extent.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
through these ChangeSets:
commit f7c52fd17a7dda42fc9e88c2b2678403419bfe63
Author: Dave Kleikamp <shaggy@linux.vnet.ibm.com>
Date: Tue Jun 16 13:43:22 2009 -0500
jfs: fix regression preventing coalescing of extents
Commit fec1878fe952b994125a3be7c94b1322db586f3b caused a regression in
which contiguous blocks being allocated to the end of an extent were
getting a new extent created. This typically results in files entirely
made up of 1-block extents even though the blocks are contiguous on
disk.
Apparently grub doesn't handle a jfs file being fragmented into too many
extents, since it refuses to boot a kernel from jfs that was created by
the 2.6.30 kernel.
Signed-off-by: Dave Kleikamp <shaggy@linux.vnet.ibm.com>
Reported-by: Alex <alevkovich@tut.by>
^ permalink raw reply [flat|nested] 48+ messages in thread
* [GIT PULL] jfs update
@ 2009-06-11 16:58 shaggy
0 siblings, 0 replies; 48+ messages in thread
From: shaggy @ 2009-06-11 16:58 UTC (permalink / raw)
To: torvalds; +Cc: akpm, linux-kernel
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/jfs_imap.c | 1 +
fs/jfs/super.c | 4 +++-
2 files changed, 4 insertions(+), 1 deletions(-)
through these ChangeSets:
commit 79f52b77b89e8b7aa9fbe62135eea198a2ecbd5b
Author: Dave Kleikamp <shaggy@linux.vnet.ibm.com>
Date: Sat May 23 20:28:41 2009 -0500
jfs: Add missing mutex_unlock call to error path
Jan Kucera found an missing call to mutex_unlock() with his static code
checker. It's an unlikely error path to hit in the real world, but it
should be fixed.
Signed-off-by: Dave Kleikamp <shaggy@linux.vnet.ibm.com>
Reported-by: Jan Kucera <kucera.jan.cz@gmail.com>
commit 9c83633ad38138855181af6936e8ac570ef7e2cb
Author: Dan Carpenter <error27@gmail.com>
Date: Tue Apr 7 14:48:16 2009 +0300
missing unlock in jfs_quota_write()
We should unlock &inode->i_mutex on the error path. This bug was
in ext2_quota_write(). I sent a patch to them today as well.
Found by smatch (http://repo.or.cz/w/smatch.git). Compile tested.
regards,
dan carpenter
Signed-off-by: Dan Carpenter <error27@gmail.com>
Signed-off-by: Dave Kleikamp <shaggy@linux.vnet.ibm.com>
^ permalink raw reply [flat|nested] 48+ messages in thread
* [git pull] jfs update
@ 2009-03-25 12:43 shaggy
0 siblings, 0 replies; 48+ messages in thread
From: shaggy @ 2009-03-25 12:43 UTC (permalink / raw)
To: torvalds; +Cc: akpm, linux-kernel
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/Kconfig | 1 +
fs/jfs/jfs_extent.c | 63 +++++-------
fs/jfs/jfs_imap.c | 10 +--
fs/jfs/jfs_metapage.c | 18 +++-
fs/jfs/jfs_types.h | 29 ------
fs/jfs/jfs_xtree.c | 263 +------------------------------------------------
fs/jfs/jfs_xtree.h | 2 -
fs/jfs/super.c | 4 +
8 files changed, 46 insertions(+), 344 deletions(-)
through these ChangeSets:
commit c68a65da35906b32505bbb8eecab316e6736e28b
Author: Randy Dunlap <randy.dunlap@oracle.com>
Date: Mon Feb 2 11:20:55 2009 -0800
jfs: needs crc32_le
JFS needs crc32_le(), so select its library config symbol:
fs/built-in.o: In function `jfs_statfs':
super.c:(.text+0x7c8c0): undefined reference to `crc32_le'
super.c:(.text+0x7c8d5): undefined reference to `crc32_le'
Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Dave Kleikamp <shaggy@linux.vnet.ibm.com>
commit 8db0c5d5ef3ab99fe9e5151872b75f45c4282e3c
Merge: 1ad53a9 45c82b5
Author: Dave Kleikamp <shaggy@linux.vnet.ibm.com>
Date: Mon Feb 2 13:40:55 2009 -0600
Merge branch 'master' of /home/shaggy/git/linus-clean/
commit 1ad53a98c927a9b5b1b57288ac0edec562fbcf8d
Author: Dave Kleikamp <shaggy@linux.vnet.ibm.com>
Date: Fri Jan 30 14:09:06 2009 -0600
jfs: Fix error handling in metapage_writepage()
Improved error handling so that last_write_complete(), and thus
end_page_writeback(), gets called only once.
Signed-off-by: Dave Kleikamp <shaggy@linux.vnet.ibm.com>
Reported-by: Eric Sesterhenn <snakebyte@gmx.de>
commit b5c816a4f177604ae708892bba074b1d534fcbee
Author: Coly Li <coly.li@suse.de>
Date: Wed Jan 21 00:05:39 2009 +0800
jfs: return f_fsid for statfs(2)
This patch makes jfs return f_fsid info for statfs(2). By Andreas'
suggestion, this patch populates a persistent f_fsid between boots/mounts
with help of on-disk uuid record.
Signed-off-by: Coly Li <coly.li@suse.de>
Signed-off-by: Dave Kleikamp <shaggy@linux.vnet.ibm.com>
commit fec1878fe952b994125a3be7c94b1322db586f3b
Author: Dave Kleikamp <shaggy@linux.vnet.ibm.com>
Date: Fri Jan 9 15:42:04 2009 -0600
jfs: remove xtLookupList()
xtLookupList() was a more generalized version of xtLookup() with a
nastier interface. Its only caller, extHint(), is actually better
suited to using xtLookup() than xtLookupList(). This also lets us
remove the definition of lxd_t, an obnoxious packed structure that was
only used in-memory.
Signed-off-by: Dave Kleikamp <shaggy@linux.vnet.ibm.com>
commit da9c138e9e1cc08aa3a4e8c09411a5d08f866445
Author: Dave Kleikamp <shaggy@linux.vnet.ibm.com>
Date: Fri Jan 9 10:53:35 2009 -0600
jfs: clean up a dangling comment
viro cleaned up an hlist hack, but left a comment where it no longer
belongs. Combine the old comment with his new one.
Signed-off-by: Dave Kleikamp <shaggy@linux.vnet.ibm.com>
^ permalink raw reply [flat|nested] 48+ messages in thread
* [git pull] jfs update
@ 2008-12-29 16:01 shaggy
0 siblings, 0 replies; 48+ messages in thread
From: shaggy @ 2008-12-29 16:01 UTC (permalink / raw)
To: torvalds; +Cc: akpm, linux-kernel
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/inode.c | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
through these ChangeSets:
commit d69e83d99cf87e3328c47bb54684360e32aef17d
Author: Dave Kleikamp <shaggy@linux.vnet.ibm.com>
Date: Tue Dec 16 10:21:34 2008 -0600
jfs: ensure symlinks are NUL-terminated
This is an alternate fix for a bug reported and fixed by Duane Griffin.
Signed-off-by: Dave Kleikamp <shaggy@linux.vnet.ibm.com>
Reported-by: Duane Griffin <duaneg@dghda.com>
^ permalink raw reply [flat|nested] 48+ messages in thread
* [git pull] jfs update
@ 2008-07-14 16:48 shaggy
0 siblings, 0 replies; 48+ messages in thread
From: shaggy @ 2008-07-14 16:48 UTC (permalink / raw)
To: torvalds; +Cc: akpm, linux-kernel
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/jfs_debug.c | 62 ++++++++++++++++++++------------------------
fs/jfs/jfs_debug.h | 10 +++---
fs/jfs/jfs_dtree.h | 3 --
fs/jfs/jfs_imap.c | 2 +-
fs/jfs/jfs_logmgr.c | 35 +++++++++++-------------
fs/jfs/jfs_metapage.c | 36 ++++++++++++-------------
fs/jfs/jfs_txnmgr.c | 68 ++++++++++++++++++++++--------------------------
fs/jfs/jfs_xtree.c | 36 ++++++++++++-------------
fs/jfs/namei.c | 2 +-
fs/jfs/super.c | 7 ++---
10 files changed, 119 insertions(+), 142 deletions(-)
through these ChangeSets:
commit ec1aef33668448718fcba79e4e981592bfd7e0a3
Author: Adrian Bunk <bunk@kernel.org>
Date: Tue Jun 10 15:12:58 2008 -0500
jfs: remove DIRENTSIZ
After fat gets fixed the unused DIRENTSIZ macro was the last user of
struct dirent we should get rid of since the kernel and userspace
versions differed.
Signed-off-by: Adrian Bunk <bunk@kernel.org>
Signed-off-by: Dave Kleikamp <shaggy@linux.vnet.ibm.com>
commit 3c65e8743bf8b5cf0f90e8d767bf1d8b50c14c76
Author: Li Zefan <lizf@cn.fujitsu.com>
Date: Wed May 28 08:58:56 2008 -0500
JFS: diAlloc() should return -EIO rather than EIO
The comment above the function says one of its return value is -EIO,
and also the caller of diAlloc() checks for -EIO:
struct inode *ialloc(struct inode *parent, umode_t mode)
{
...
rc = diAlloc(parent, S_ISDIR(mode), inode);
if (rc) {
jfs_warn("ialloc: diAlloc returned %d!", rc);
if (rc == -EIO)
make_bad_inode(inode);
...
Signed-off-by: Li Zefan <lizf@cn.fujitsu.com>
Signed-off-by: Dave Kleikamp <shaggy@linux.vnet.ibm.com>
commit 6536d2891ba2c4e837ba8478dc13bb173ed24a23
Author: Dave Kleikamp <shaggy@linux.vnet.ibm.com>
Date: Wed May 21 10:45:16 2008 -0500
JFS: skip bad iput() call in error path
If jfs_iget() fails, we can't call iput() on the returned error.
Thanks to Eric Sesterhenn's fuzzer testing for reporting the problem.
Signed-off-by: Dave Kleikamp <shaggy@linux.vnet.ibm.com>
commit b2e03ca7485cac033a0667d9e45e28d32fdee9a5
Author: Alexey Dobriyan <adobriyan@gmail.com>
Date: Tue May 13 08:22:10 2008 -0500
JFS: switch to seq_files
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: Dave Kleikamp <shaggy@linux.vnet.ibm.com>
commit 88f85a55c0645c2b7e03bf34d2a90eddf6de34fa
Author: Marcin Slusarz <marcin.slusarz@gmail.com>
Date: Mon May 12 16:42:43 2008 -0500
JFS: 0 is not valid errno value so return NULL from jfs_lookup
Signed-off-by: Marcin Slusarz <marcin.slusarz@gmail.com>
Signed-off-by: Dave Kleikamp <shaggy@linux.vnet.ibm.com>
Cc: jfs-discussion@lists.sourceforge.net
Cc: Alexander Viro <viro@zeniv.linux.org.uk>
^ permalink raw reply [flat|nested] 48+ messages in thread
* [git pull] jfs update
@ 2008-04-17 18:36 shaggy
0 siblings, 0 replies; 48+ messages in thread
From: shaggy @ 2008-04-17 18:36 UTC (permalink / raw)
To: torvalds; +Cc: akpm, linux-kernel
Linus,
It's been kind of slow in JFS land, but I have a couple small cleanups I've
been carrying around. 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/jfs_dmap.c | 11 +++++------
fs/jfs/jfs_dmap.h | 2 +-
fs/jfs/jfs_imap.c | 15 ++++++---------
fs/jfs/jfs_xtree.c | 26 ++++++++------------------
4 files changed, 20 insertions(+), 34 deletions(-)
through these ChangeSets:
Commit: 15732a1cb5f9078d460a254449eb59391e531ffc
Author: Harvey Harrison <harvey.harrison@gmail.com> Wed, 05 Mar 2008 14:38:22 -0600
jfs: replace __inline with inline
Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: Dave Kleikamp <shaggy@linux.vnet.ibm.com>
Commit: 891456227881da9c565c455010380a40d385a478
Author: Marcin Slusarz <marcin.slusarz@gmail.com> Wed, 13 Feb 2008 15:34:20 -0600
jfs: le*_add_cpu conversion
replace all:
little_endian_variable = cpu_to_leX(leX_to_cpu(little_endian_variable) +
expression_in_cpu_byteorder);
with:
leX_add_cpu(&little_endian_variable, expression_in_cpu_byteorder);
generated with semantic patch
Signed-off-by: Marcin Slusarz <marcin.slusarz@gmail.com>
Signed-off-by: Dave Kleikamp <shaggy@linux.vnet.ibm.com>
Cc: jfs-discussion@lists.sourceforge.net
^ permalink raw reply [flat|nested] 48+ messages in thread
* [git pull] jfs update
@ 2008-02-07 21:02 shaggy
0 siblings, 0 replies; 48+ messages in thread
From: shaggy @ 2008-02-07 21:02 UTC (permalink / raw)
To: torvalds; +Cc: akpm, linux-kernel
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/file.c | 5 ++++-
fs/jfs/ioctl.c | 31 ++++++++++++++++++++++++++++---
fs/jfs/jfs_dinode.h | 2 ++
fs/jfs/jfs_inode.h | 4 ++--
fs/jfs/namei.c | 5 ++++-
5 files changed, 40 insertions(+), 7 deletions(-)
through these ChangeSets:
Commit: ef1fc2f01e02951a0d8520ec3aa0b38606d74b55
Author: Andi Kleen <ak@suse.de> Sun, 27 Jan 2008 17:02:02 -0600
BKL-removal: Implement a compat_ioctl handler for JFS
The ioctls were already compatible except for the actual values so this
was fairly easy to do.
Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Dave Kleikamp <shaggy@linux.vnet.ibm.com>
Commit: baab81fa518ecfac597402b462631f5593926623
Author: Andi Kleen <ak@suse.de> Sun, 27 Jan 2008 16:58:51 -0600
BKL-removal: Use unlocked_ioctl for jfs
Convert jfs_ioctl over to not use the BKL. The only potential race
I could see was with two ioctls in parallel changing the flags
and losing the updates. Use the i_mutex to protect against this.
Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Dave Kleikamp <shaggy@linux.vnet.ibm.com>
^ permalink raw reply [flat|nested] 48+ messages in thread
* [git pull] jfs update
@ 2008-01-25 19:27 shaggy
0 siblings, 0 replies; 48+ messages in thread
From: shaggy @ 2008-01-25 19:27 UTC (permalink / raw)
To: torvalds; +Cc: akpm, linux-kernel
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/jfs_dtree.c | 27 +++++++++++--------------
fs/jfs/jfs_dtree.h | 4 +--
fs/jfs/jfs_imap.c | 4 +--
fs/jfs/jfs_logmgr.c | 34 ++++++++++++++-----------------
fs/jfs/jfs_metapage.c | 43 ++++++++++++++++++++++------------------
fs/jfs/jfs_mount.c | 2 -
fs/jfs/jfs_umount.c | 4 +--
fs/jfs/namei.c | 4 +--
fs/jfs/resize.c | 2 -
fs/jfs/super.c | 6 +++++
10 files changed, 68 insertions(+), 62 deletions(-)
through these ChangeSets:
Commit: 5c5e32ceeb6b64496a1842d5d99e4ac8d20166c4
Author: Miklos Szeredi <mszeredi@suse.cz> Thu, 24 Jan 2008 16:13:21 -0600
mount options: fix jfs
Add iocharset= and errors= options to /proc/mounts for jfs
filesystems.
Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
Signed-off-by: Dave Kleikamp <shaggy@linux.vnet.ibm.com>
Commit: 967c9ec4ec6178bee42f4231c49a3d7f77627978
Author: Dave Kleikamp <shaggy@linux.vnet.ibm.com> Thu, 10 Jan 2008 16:04:25 -0600
JFS: simplify types to get rid of sparse warning
jfs_metapage.c was using uints and unsigned ints inconsistently when
regular ints suffice.
Signed-off-by: Dave Kleikamp <shaggy@linux.vnet.ibm.com>
Commit: da8a41d19233c2bdcc59447aedc808fcdaabf5b7
Author: Dave Kleikamp <shaggy@linux.vnet.ibm.com> Tue, 13 Nov 2007 22:25:41 -0600
JFS: FIx one more plain integer as NULL pointer warning
Signed-off-by: Dave Kleikamp <shaggy@linux.vnet.ibm.com>
Commit: 09aaa749f637b19c308464c2b65a001e67c2a16c
Author: Joe Perches <joe@perches.com> Tue, 13 Nov 2007 22:16:08 -0600
JFS: Remove defconfig ptr comparison to 0
Remove sparse warning: Using plain integer as NULL pointer
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Dave Kleikamp <shaggy@linux.vnet.ibm.com>
Commit: a7fe0ba7eee4f7c53077ff2bed2b581db17d00df
Author: Shaun Zinck <shaun.zinck@gmail.com> Fri, 31 Aug 2007 12:57:28 -0500
JFS: use DIV_ROUND_UP where appropriate
This replaces some macros and code, which do the same thing as DIV_ROUND_UP
defined in kernel.h, to use the DIV_ROUND_UP macro.
Signed-off-by: Shaun Zinck <shaun.zinck@gmail.com>
Signed-off-by: Dave Kleikamp <shaggy@linux.vnet.ibm.com>
Commit: 1eb3a711d6a1c8a4697a2e89d09048353b8aefd3
Author: Jack Stone <jack@hawkeye.stone.uk.eu.org> Tue, 31 Jul 2007 09:36:53 -0500
Remove unnecessary kmalloc casts in the jfs filesystem
Signed-off-by: Jack Stone <jack@hawkeye.stone.uk.eu.org>
Signed-off-by: Dave Kleikamp <shaggy@linux.vnet.ibm.com>
Commit: 54af6233d1cb84cdfaa6ea44ea0db0bcf518baac
Author: Nick Piggin <npiggin@suse.de> Mon, 26 Nov 2007 14:58:10 -0600
JFS is missing a memory barrier
JFS is missing a memory barrier needed to close the critical section before
clearing the lock bit. Use lock bitops for this.
unlock_page() has a second barrier after clearing the lock, which is
required because it checks whether the waitqueue is active without locks.
Such a barrier is not required here because the waitqueue spinlock is
always taken (something to think about if performance is an issue).
Signed-off-by: Nick Piggin <npiggin@suse.de>
Signed-off-by: Dave Kleikamp <shaggy@linux.vnet.ibm.com>
Commit: 67e6682f18b3bf812a994ae027ff87174a297ae8
Author: Dave Kleikamp <shaggy@linux.vnet.ibm.com> Wed, 10 Oct 2007 11:11:24 -0500
JFS: Make sure special inode data is written after journal is flushed
This patch makes sure that data that we tried to flush before the journal
was completely written actually gets pushed to disk.
To avoid duplicating code, moved common code to write_special_inodes().
Signed-off-by: Dave Kleikamp <shaggy@linux.vnet.ibm.com>
Commit: 29a424f28390752a4ca2349633aaacc6be494db5
Author: Dave Kleikamp <shaggy@linux.vnet.ibm.com> Thu, 03 Jan 2008 13:09:33 -0600
JFS: clear PAGECACHE_TAG_DIRTY for no-write pages
When JFS decides to drop a dirty metapage, it simply clears the META_dirty
bit and leave alone the PG_dirty and PAGECACHE_TAG_DIRTY bits.
When such no-write page goes to metapage_writepage(), the `relic'
PAGECACHE_TAG_DIRTY tag should be cleared, to prevent pdflush from
repeatedly trying to sync them. This is done through
set_page_writeback(), so call it should be called in all cases. If
no I/O is initiated, end_page_writeback() should be called immediately.
This is how __block_write_full_page() does things.
Signed-off-by: Dave Kleikamp <shaggy@linux.vnet.ibm.com>
CC: Fengguang Wu <wfg@mail.ustc.edu.cn>
^ permalink raw reply [flat|nested] 48+ messages in thread
* [git pull] jfs update
@ 2007-10-10 13:35 shaggy
0 siblings, 0 replies; 48+ messages in thread
From: shaggy @ 2007-10-10 13:35 UTC (permalink / raw)
To: torvalds; +Cc: akpm, linux-kernel
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/jfs_dtree.c | 8 ++------
fs/jfs/jfs_dtree.h | 4 ++--
fs/jfs/resize.c | 2 +-
3 files changed, 5 insertions(+), 9 deletions(-)
through these ChangeSets:
Commit: 2c5c37da093cd2f455ce818ee7b02b7a39d10498
Author: Shaun Zinck <shaun.zinck@gmail.com> Fri, 31 Aug 2007 12:57:28 -0500
JFS: use DIV_ROUND_UP where appropriate
This replaces some macros and code, which do the same thing as DIV_ROUND_UP
defined in kernel.h, to use the DIV_ROUND_UP macro.
Signed-off-by: Shaun Zinck <shaun.zinck@gmail.com>
Signed-off-by: Dave Kleikamp <shaggy@linux.vnet.ibm.com>
Commit: 85e65c39f050a4964d0b943304bd896ff5375988
Author: Jack Stone <jack@hawkeye.stone.uk.eu.org> Tue, 31 Jul 2007 09:36:53 -0500
Remove unnecessary kmalloc casts in the jfs filesystem
Signed-off-by: Jack Stone <jack@hawkeye.stone.uk.eu.org>
Signed-off-by: Dave Kleikamp <shaggy@linux.vnet.ibm.com>
^ permalink raw reply [flat|nested] 48+ messages in thread
* [git pull] jfs update
@ 2007-07-09 19:34 Dave Kleikamp
0 siblings, 0 replies; 48+ messages in thread
From: Dave Kleikamp @ 2007-07-09 19:34 UTC (permalink / raw)
To: torvalds; +Cc: akpm, linux-kernel
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/endian24.h | 2
fs/jfs/jfs_debug.c | 28 --
fs/jfs/jfs_debug.h | 2
fs/jfs/jfs_dinode.h | 42 +--
fs/jfs/jfs_dmap.c | 419 +++++++++++++++++++--------------------
fs/jfs/jfs_dmap.h | 118 +++++------
fs/jfs/jfs_dtree.c | 105 ++++-----
fs/jfs/jfs_dtree.h | 2
fs/jfs/jfs_extent.c | 102 ++++-----
fs/jfs/jfs_filsys.h | 13 -
fs/jfs/jfs_imap.c | 296 +++++++++++++--------------
fs/jfs/jfs_imap.h | 98 ++++-----
fs/jfs/jfs_incore.h | 4
fs/jfs/jfs_logmgr.c | 90 ++++----
fs/jfs/jfs_logmgr.h | 26 +-
fs/jfs/jfs_metapage.c | 3
fs/jfs/jfs_mount.c | 6
fs/jfs/jfs_txnmgr.c | 302 ++++++++++++++--------------
fs/jfs/jfs_txnmgr.h | 2
fs/jfs/jfs_types.h | 20 -
fs/jfs/jfs_umount.c | 2
fs/jfs/jfs_xtree.c | 428 +++++++++++++++++++---------------------
fs/jfs/jfs_xtree.h | 48 ++--
fs/jfs/namei.c | 26 +-
fs/jfs/resize.c | 48 ++--
fs/jfs/xattr.c | 9
26 files changed, 1096 insertions(+), 1145 deletions(-)
through these ChangeSets:
Commit: 288e4d838d1e999c0515f85a337cacb2be233071
Author: Dave Kleikamp <shaggy@linux.vnet.ibm.com> Wed, 13 Jun 2007 10:17:50 -0500
JFS: Update print_hex_dump() syntax
Signed-off-by: Dave Kleikamp <shaggy@linux.vnet.ibm.com>
Commit: 209e101bf408a50acc426e32c8252daefacde5b0
Author: Dave Kleikamp <shaggy@linux.vnet.ibm.com> Wed, 06 Jun 2007 16:30:17 -0500
JFS: use print_hex_dump() rather than private dump_mem() function
Signed-off-by: Dave Kleikamp <shaggy@linux.vnet.ibm.com>
Commit: f720e3ba558680cc7dd3995d005bdc8ee2ef46af
Author: Dave Kleikamp <shaggy@linux.vnet.ibm.com> Wed, 06 Jun 2007 15:28:35 -0500
JFS: Whitespace cleanup and remove some dead code
Signed-off-by: Dave Kleikamp <shaggy@linux.vnet.ibm.com>
^ permalink raw reply [flat|nested] 48+ messages in thread
* [git pull] jfs update
@ 2007-05-08 14:51 Dave Kleikamp
0 siblings, 0 replies; 48+ messages in thread
From: Dave Kleikamp @ 2007-05-08 14:51 UTC (permalink / raw)
To: torvalds; +Cc: akpm, linux-kernel
Linus,
I added one patch since the last pull request. This fixes a hang that
has been seen a few times in recent kernels.
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:
Documentation/filesystems/jfs.txt | 8 +++++++-
fs/jfs/inode.c | 1 -
fs/jfs/ioctl.c | 2 ++
fs/jfs/jfs_imap.c | 2 ++
fs/jfs/jfs_inode.c | 18 ++++++++++++++++++
fs/jfs/jfs_inode.h | 1 +
fs/jfs/jfs_lock.h | 2 +-
fs/jfs/jfs_logmgr.c | 7 ++++---
fs/jfs/jfs_txnmgr.c | 6 +++---
9 files changed, 38 insertions(+), 9 deletions(-)
through these ChangeSets:
Commit: 05ec9e26be1f668ccba4ca54d9a4966c6208c611
Author: Dave Kleikamp <shaggy@linux.vnet.ibm.com> Sat, 05 May 2007 14:24:05 -0500
JFS: Fix race waking up jfsIO kernel thread
It's possible for a journal I/O request to be added to the log_redrive
queue and the jfsIO thread to be awakened after the thread releases
log_redrive_lock but before it sets its state to TASK_INTERRUPTIBLE.
The jfsIO thread should set the state before giving up the spinlock, so
the waking thread will really wake it.
Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
Commit: 3cbb1c8e1a4787d3dc2951b7615d7bb3788c49a0
Author: Milind Arun Choudhary <milindchoudhary@gmail.com> Thu, 26 Apr 2007 07:30:29 -0500
JFS: use __set_current_state()
use __set_current_state(TASK_*) instead of current->state = TASK_*
Signed-off-by: Milind Arun Choudhary <milindchoudhary@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Dave Kleikamp <shaggy@linux.vnet.ibm.com>
Commit: 3e2221c73cba7d33fd5706f9bc4906ffaf421478
Author: Dave Kleikamp <shaggy@linux.vnet.ibm.com> Wed, 25 Apr 2007 09:36:20 -0500
Copy i_flags to jfs inode flags on write
This mirrors Jan Kara's patches for ext3. This patch makes sure that
changes made to inode->i_flags are reflected on disk for jfs. It also
moves a call of jfs_set_inode_flags() to be more consistent with where
jfs_get_inode_flags() is called.
Signed-off-by: Dave Kleikamp <shaggy@linux.vnet.ibm.com>
Commit: ba863a0016a33637acc7888698a5d75096fcec05
Author: Dave Kleikamp <shaggy@linux.vnet.ibm.com> Fri, 09 Mar 2007 10:27:31 -0600
JFS: document uid, gid, and umask mount options in jfs.txt
Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
^ permalink raw reply [flat|nested] 48+ messages in thread
* [git pull] jfs update
@ 2007-04-28 13:20 Dave Kleikamp
0 siblings, 0 replies; 48+ messages in thread
From: Dave Kleikamp @ 2007-04-28 13:20 UTC (permalink / raw)
To: torvalds; +Cc: akpm, linux-kernel
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:
Documentation/filesystems/jfs.txt | 8 +++++++-
fs/jfs/inode.c | 1 -
fs/jfs/ioctl.c | 2 ++
fs/jfs/jfs_imap.c | 2 ++
fs/jfs/jfs_inode.c | 18 ++++++++++++++++++
fs/jfs/jfs_inode.h | 1 +
fs/jfs/jfs_lock.h | 2 +-
fs/jfs/jfs_logmgr.c | 4 ++--
fs/jfs/jfs_txnmgr.c | 6 +++---
9 files changed, 36 insertions(+), 8 deletions(-)
through these ChangeSets:
Commit: 3cbb1c8e1a4787d3dc2951b7615d7bb3788c49a0
Author: Milind Arun Choudhary <milindchoudhary@gmail.com> Thu, 26 Apr 2007 07:30:29 -0500
JFS: use __set_current_state()
use __set_current_state(TASK_*) instead of current->state = TASK_*
Signed-off-by: Milind Arun Choudhary <milindchoudhary@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Dave Kleikamp <shaggy@linux.vnet.ibm.com>
Commit: 3e2221c73cba7d33fd5706f9bc4906ffaf421478
Author: Dave Kleikamp <shaggy@linux.vnet.ibm.com> Wed, 25 Apr 2007 09:36:20 -0500
Copy i_flags to jfs inode flags on write
This mirrors Jan Kara's patches for ext3. This patch makes sure that
changes made to inode->i_flags are reflected on disk for jfs. It also
moves a call of jfs_set_inode_flags() to be more consistent with where
jfs_get_inode_flags() is called.
Signed-off-by: Dave Kleikamp <shaggy@linux.vnet.ibm.com>
Commit: ba863a0016a33637acc7888698a5d75096fcec05
Author: Dave Kleikamp <shaggy@linux.vnet.ibm.com> Fri, 09 Mar 2007 10:27:31 -0600
JFS: document uid, gid, and umask mount options in jfs.txt
Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
^ permalink raw reply [flat|nested] 48+ messages in thread
* [git pull] jfs update
@ 2007-02-14 23:08 Dave Kleikamp
0 siblings, 0 replies; 48+ messages in thread
From: Dave Kleikamp @ 2007-02-14 23:08 UTC (permalink / raw)
To: torvalds; +Cc: akpm, linux-kernel
Linus,
I'm tired of seeing a warning every time jfs is compiled. A similar patch
has been in jgarzik's misc-2.6.git#gccbug for a while now.
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/jfs_txnmgr.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
through these ChangeSets:
Commit: c9e3ad6021e5eeb1c25cc4a573bd6427019a7a86
Author: Dave Kleikamp <shaggy@linux.vnet.ibm.com> Fri, 09 Feb 2007 15:36:47 -0600
JFS: Get rid of "may be used uninitialized" warnings
Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
^ permalink raw reply [flat|nested] 48+ messages in thread
* [git pull] jfs update
@ 2007-02-07 13:35 Dave Kleikamp
0 siblings, 0 replies; 48+ messages in thread
From: Dave Kleikamp @ 2007-02-07 13:35 UTC (permalink / raw)
To: torvalds; +Cc: akpm, linux-kernel
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/inode.c | 6 ++---
fs/jfs/jfs_debug.h | 5 ----
fs/jfs/jfs_dmap.c | 16 ++++++-------
fs/jfs/jfs_imap.c | 16 ++++++-------
fs/jfs/jfs_incore.h | 29 ++++++++++++++++++++++--
fs/jfs/jfs_lock.h | 2 -
fs/jfs/jfs_metapage.c | 2 -
fs/jfs/jfs_txnmgr.c | 2 -
fs/jfs/jfs_xtree.c | 15 ++++++++++++
fs/jfs/namei.c | 48 +++++++++++++++++++++++-----------------
10 files changed, 92 insertions(+), 49 deletions(-)
through these ChangeSets:
Commit: 7220c0177b45600eef2cfd3e5e57ab5b96f3222c
Author: Dave Kleikamp <shaggy@linux.vnet.ibm.com> Fri, 26 Jan 2007 10:14:36 -0600
JFS: Remove incorrect kgdb define
jfs_debug.h uses an incorrect CONFIG_KERNEL_ASSERT ifdef to redefine the
assert macro for kgdb use. I believe the code worked a long time ago, but
today it's not a valid config option. Since I'm not aware of anybody
interested in debugging jfs with kgdb, it should just be removed.
Thanks to Robert P. J. Day for reporting this.
Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
Commit: 4aa0d230c2cfc1ac4bcf7c5466f9943cf14233a9
Author: Dave Kleikamp <shaggy@linux.vnet.ibm.com> Wed, 17 Jan 2007 21:18:35 -0600
JFS: call io_schedule() instead of schedule() to avoid deadlock
The introduction of Jens Axboe's explicit i/o plugging patches introduced a
deadlock in jfs. This was caused by the process initiating I/O not
unplugging the queue before waiting on the commit thread. The commit
thread itself was waiting for that I/O to complete. Calling io_schedule()
rather than schedule() unplugs the I/O queue avoiding the deadlock, and it
appears to be the right function to call in any case.
Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
Commit: 82d5b9a7c63054a9a2cd838ffd177697f86e7e34
Author: Dave Kleikamp <shaggy@linux.vnet.ibm.com> Tue, 09 Jan 2007 14:14:48 -0600
JFS: Add lockdep annotations
Yeah, it's about time.
Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
Commit: 17e6afc75ad0150d265a86a8f155b2871f9c07fe
Author: Dave Kleikamp <shaggy@linux.vnet.ibm.com> Tue, 09 Jan 2007 08:57:34 -0600
JFS: Avoid BUG() on a damaged file system
On Mon, 2006-12-18 at 19:51 +0100, Eric Sesterhenn wrote:
> hi,
>
> while playing around with fsfuzzer, i got the following oops with jfs:
>
> [ 851.804875] BUG at fs/jfs/jfs_xtree.c:760
> assert(!BT_STACK_FULL(btstack))
> [ 851.805179] ------------[ cut here ]------------
> [ 851.805238] kernel BUG at fs/jfs/jfs_xtree.c:760!
JFS should mark the superblock dirty and return an error rather than
calling BUG().
Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
^ permalink raw reply [flat|nested] 48+ messages in thread
* [git pull] jfs update
@ 2006-12-12 15:16 Dave Kleikamp
0 siblings, 0 replies; 48+ messages in thread
From: Dave Kleikamp @ 2006-12-12 15:16 UTC (permalink / raw)
To: torvalds; +Cc: akpm, linux-kernel
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/jfs_filsys.h | 42 +++++++++++++++++++++---------------------
1 file changed, 21 insertions(+), 21 deletions(-)
through these ChangeSets:
Commit: 36b12fb709d229f277efbbe710031d5a429b2412
Author: Dave Kleikamp <shaggy@austin.ibm.com> Wed, 06 Dec 2006 17:48:32 -0600
JFS: Fix conflicting superblock flags
JFS_NOINTEGRITY and JFS_USRQUOTA are defined to be the same value.
Change JFS_NOINTEGRITY to 0x40 and re-order the flags in the header
file to avoid repeating this problem.
Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
^ permalink raw reply [flat|nested] 48+ messages in thread
* [git pull] jfs update
@ 2006-11-04 3:07 Dave Kleikamp
0 siblings, 0 replies; 48+ messages in thread
From: Dave Kleikamp @ 2006-11-04 3:07 UTC (permalink / raw)
To: torvalds; +Cc: akpm, linux-kernel
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/xattr.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
through these ChangeSets:
Commit: d572b87946f8c598b3cad86a7913862dd48daadb
Author: Dave Kleikamp <shaggy@austin.ibm.com> Thu, 02 Nov 2006 10:50:40 -0600
JFS: Remove redundant xattr permission checking
The vfs handles most permissions for setting and retrieving xattrs.
This patch removes a redundant and wrong check so that it won't override
the correct behavior which is being fixed in the vfs.
Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
^ permalink raw reply [flat|nested] 48+ messages in thread
* [git pull] jfs update
@ 2006-11-02 14:23 Dave Kleikamp
0 siblings, 0 replies; 48+ messages in thread
From: Dave Kleikamp @ 2006-11-02 14:23 UTC (permalink / raw)
To: torvalds; +Cc: akpm, linux-kernel
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/file.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
through these ChangeSets:
Commit: 89f68225876db7df638de2884b561facb1870239
Author: Daniel Drake <ddrake@brontes3d.com> Mon, 30 Oct 2006 11:47:02 -0600
jfs: Add splice support
This allows the splice() and tee() syscalls to be used with JFS.
Signed-off-by: Daniel Drake <ddrake@brontes3d.com>
Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
^ permalink raw reply [flat|nested] 48+ messages in thread
* [git pull] jfs update
@ 2006-10-23 12:53 Dave Kleikamp
0 siblings, 0 replies; 48+ messages in thread
From: Dave Kleikamp @ 2006-10-23 12:53 UTC (permalink / raw)
To: torvalds; +Cc: akpm, linux-kernel
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/jfs_imap.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
through these ChangeSets:
Commit: 8f6cff98477edbcd8ae4976734ba7edd07bdd244
Author: Dave Kleikamp <shaggy@austin.ibm.com> Fri, 13 Oct 2006 12:42:36 -0500
JFS: pageno needs to be long
diRead and diWrite are representing the page number as an unsigned int.
This causes file system corruption on volumes larger than 16TB.
Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
^ permalink raw reply [flat|nested] 48+ messages in thread
* Re: [git pull] jfs update
2006-10-02 15:41 ` Dave Kleikamp
@ 2006-10-02 16:21 ` Al Viro
0 siblings, 0 replies; 48+ messages in thread
From: Al Viro @ 2006-10-02 16:21 UTC (permalink / raw)
To: Dave Kleikamp; +Cc: Linus Torvalds, akpm, linux-kernel
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
^ permalink raw reply [flat|nested] 48+ messages in thread
* Re: [git pull] jfs update
2006-10-02 15:31 ` Linus Torvalds
@ 2006-10-02 15:41 ` Dave Kleikamp
2006-10-02 16:21 ` Al Viro
0 siblings, 1 reply; 48+ messages in thread
From: Dave Kleikamp @ 2006-10-02 15:41 UTC (permalink / raw)
To: Linus Torvalds; +Cc: akpm, linux-kernel
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 <shaggy@austin.ibm.com>
> > (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
^ permalink raw reply [flat|nested] 48+ messages in thread
* Re: [git pull] jfs update
2006-10-02 15:16 Dave Kleikamp
@ 2006-10-02 15:31 ` Linus Torvalds
2006-10-02 15:41 ` Dave Kleikamp
0 siblings, 1 reply; 48+ messages in thread
From: Linus Torvalds @ 2006-10-02 15:31 UTC (permalink / raw)
To: Dave Kleikamp; +Cc: akpm, linux-kernel
On Mon, 2 Oct 2006, Dave Kleikamp wrote:
>
> Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
> (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
^ permalink raw reply [flat|nested] 48+ messages in thread
* [git pull] jfs update
@ 2006-10-02 15:16 Dave Kleikamp
2006-10-02 15:31 ` Linus Torvalds
0 siblings, 1 reply; 48+ messages in thread
From: Dave Kleikamp @ 2006-10-02 15:16 UTC (permalink / raw)
To: torvalds; +Cc: akpm, linux-kernel
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 <shaggy@austin.ibm.com> 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 <shaggy@austin.ibm.com>
(cherry picked from f74156539964d7b3d5164fdf8848e6a682f75b97 commit)
Commit: 087387f90f577f5a0ab68d33ef326c9bb6d80dda
Author: Akinobu Mita <mita@miraclelinux.com> 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 <mita@miraclelinux.com>
Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
(cherry picked from 2b46f77976f798f3fe800809a1d0ed38763c71c8 commit)
Commit: 2a6968a9784551c216f9379a728d4104dbad98a8
Author: Tony Breeds <tony@bakeyournoodle.com> Mon, 11 Sep 2006 08:19:19 -0500
JFS: Remove shadow variable from fs/jfs/jfs_txnmgr.c:xtLog()
Signed-off-by: Tony Breeds <tony@bakeyournoodle.com>
Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
(cherry picked from bdc3d9e5af7d9c105be734dd7b5c3f1d9425a15a commit)
^ permalink raw reply [flat|nested] 48+ messages in thread
* [git pull] jfs update
@ 2006-09-25 13:04 Dave Kleikamp
0 siblings, 0 replies; 48+ messages in thread
From: Dave Kleikamp @ 2006-09-25 13:04 UTC (permalink / raw)
To: torvalds; +Cc: akpm, linux-kernel
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 | 12 +-
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, 528 insertions(+), 530 deletions(-)
through these ChangeSets:
commit f74156539964d7b3d5164fdf8848e6a682f75b97
tree e565845b8de7f7a8a37cbd985fbea3f1ee73ceaf
parent 649dbaffea876b56839f35530976a3124c361f6b
author Dave Kleikamp <shaggy@austin.ibm.com> Thu, 14 Sep 2006 10:49:48 -0500
committer Dave Kleikamp <shaggy@austin.ibm.com> Thu, 14 Sep 2006 10:49:48 -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 <shaggy@austin.ibm.com>
commit 649dbaffea876b56839f35530976a3124c361f6b
tree 23674ca513391537ea3679477a573d92e14a666a
parent 2b46f77976f798f3fe800809a1d0ed38763c71c8
author Dave Kleikamp <shaggy@austin.ibm.com> Thu, 14 Sep 2006 09:34:02 -0500
committer Dave Kleikamp <shaggy@austin.ibm.com> Thu, 14 Sep 2006 09:34:02 -0500
JFS: eliminate compiler warning
gcc-4.1.1 complains in txCommit that pxd may be used unitialized. The usage
is safe since the initialization and later use depend on the same condition.
Initializing the data eliminates the warning and the overhead is minimal as
this is not really a fast path.
Patch suggested by Tony Breeds.
Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
commit 2b46f77976f798f3fe800809a1d0ed38763c71c8
tree dc02e78cca68f6a7952f3ece9581914dfedcaab8
parent bdc3d9e5af7d9c105be734dd7b5c3f1d9425a15a
author Akinobu Mita <mita@miraclelinux.com> Thu, 14 Sep 2006 09:22:38 -0500
committer Dave Kleikamp <shaggy@austin.ibm.com> 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 <mita@miraclelinux.com>
Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
commit bdc3d9e5af7d9c105be734dd7b5c3f1d9425a15a
tree 8a9fd8cf85f44e2595b42b565cf98be1772fe3b0
parent 38f5745c5a90641079fd5b48600ae63f7ab6edcd
author Tony Breeds <tony@bakeyournoodle.com> Mon, 11 Sep 2006 08:19:19 -0500
committer Dave Kleikamp <shaggy@austin.ibm.com> Mon, 11 Sep 2006 08:19:19 -0500
JFS: Remove shadow variable from fs/jfs/jfs_txnmgr.c:xtLog()
Signed-off-by: Tony Breeds <tony@bakeyournoodle.com>
Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
^ permalink raw reply [flat|nested] 48+ messages in thread
* [git pull] jfs update
@ 2006-08-03 14:37 Dave Kleikamp
0 siblings, 0 replies; 48+ messages in thread
From: Dave Kleikamp @ 2006-08-03 14:37 UTC (permalink / raw)
To: torvalds; +Cc: akpm, linux-kernel
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/inode.c | 16 +----
fs/jfs/jfs_inode.h | 1
fs/jfs/super.c | 118 +++++++++++++++++++++++++++++++++++++++++--
3 files changed, 120 insertions(+), 15 deletions(-)
through these ChangeSets:
commit 8bcb2839b74d605f5549962a6e69dc07768e95b6
tree 3cb69aeaedc8444ed91882ac63714b52a2df6836
parent 115ff50bade0f93a288677745a5884def6cbf9b1
author Dave Kleikamp <shaggy@austin.ibm.com> Fri, 28 Jul 2006 08:46:05 -0500
committer Dave Kleikamp <shaggy@austin.ibm.com> Fri, 28 Jul 2006 08:46:05 -0500
JFS: Fix bug in quota code. tmp_bh.b_size must be initialized
Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
commit 115ff50bade0f93a288677745a5884def6cbf9b1
tree a646404a99d0587ea0113a2c6dad71d7854a84d4
parent 64821324ca49f24be1a66f2f432108f96a24e596
author Dave Kleikamp <shaggy@austin.ibm.com> Wed, 26 Jul 2006 14:52:13 -0500
committer Dave Kleikamp <shaggy@austin.ibm.com> Wed, 26 Jul 2006 14:52:13 -0500
JFS: Quota support broken, no quota_read and quota_write
jfs_quota_read/write are very near duplicates of ext2_quota_read/write.
Cleaned up jfs_get_block as long as I had to change it to be non-static.
Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
^ permalink raw reply [flat|nested] 48+ messages in thread
* [git pull] jfs update
@ 2006-07-14 1:45 Dave Kleikamp
0 siblings, 0 replies; 48+ messages in thread
From: Dave Kleikamp @ 2006-07-14 1:45 UTC (permalink / raw)
To: torvalds; +Cc: linux-kernel
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/jfs_txnmgr.c | 2 +-
fs/jfs/namei.c | 33 ++++++++++++++++-----------------
2 files changed, 17 insertions(+), 18 deletions(-)
through these ChangeSets:
commit 48ce8b056c88920c8ac187781048f5dae33c81b9
tree d03665af62302a252a5c60e7a920190ed93cbec8
parent 672c6108a51bf559d19595d9f8193dfd81f0f752
author Evgeniy Dushistov <dushistov@mail.ru> Mon, 05 Jun 2006 08:21:03 -0500
committer Dave Kleikamp <shaggy@austin.ibm.com> Mon, 05 Jun 2006 08:21:03 -0500
JFS: commit_mutex cleanups
I look at code, and see that
1)locks wasn't release in the opposite order in which they were taken
2)in jfs_rename we lock new_ip, and in "error path" we didn't unlock it
3)I see strange expression: "! !"
May be this worth to fix?
Signed-off-by: Evgeniy Dushistov <dushistov@mail.ru>
Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
^ permalink raw reply [flat|nested] 48+ messages in thread
* [git pull] jfs update
@ 2006-07-06 14:20 Dave Kleikamp
0 siblings, 0 replies; 48+ messages in thread
From: Dave Kleikamp @ 2006-07-06 14:20 UTC (permalink / raw)
To: torvalds; +Cc: linux-kernel
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/jfs_txnmgr.c | 2 +-
fs/jfs/namei.c | 33 ++++++++++++++++-----------------
2 files changed, 17 insertions(+), 18 deletions(-)
through these ChangeSets:
commit 48ce8b056c88920c8ac187781048f5dae33c81b9
tree d03665af62302a252a5c60e7a920190ed93cbec8
parent 672c6108a51bf559d19595d9f8193dfd81f0f752
author Evgeniy Dushistov <dushistov@mail.ru> Mon, 05 Jun 2006 08:21:03 -0500
committer Dave Kleikamp <shaggy@austin.ibm.com> Mon, 05 Jun 2006 08:21:03 -0500
JFS: commit_mutex cleanups
I look at code, and see that
1)locks wasn't release in the opposite order in which they were taken
2)in jfs_rename we lock new_ip, and in "error path" we didn't unlock it
3)I see strange expression: "! !"
May be this worth to fix?
Signed-off-by: Evgeniy Dushistov <dushistov@mail.ru>
Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
^ permalink raw reply [flat|nested] 48+ messages in thread
* [git pull] jfs update
@ 2006-05-24 13:10 Dave Kleikamp
0 siblings, 0 replies; 48+ messages in thread
From: Dave Kleikamp @ 2006-05-24 13:10 UTC (permalink / raw)
To: torvalds; +Cc: linux-kernel
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 file:
fs/jfs/jfs_metapage.c | 20 +++++---------------
1 file changed, 5 insertions(+), 15 deletions(-)
through these ChangeSets:
JFS: Fix multiple errors in metapage_releasepage
It looks like metapage_releasepage was making in invalid assumption that
the releasepage method would not be called on a dirty page. Instead of
issuing a warning and releasing the metapage, it should return 0, indicating
that the private data for the page cannot be released.
I also realized that metapage_releasepage had the return code all wrong. If
it is successful in releasing the private data, it should return 1, otherwise
it needs to return 0.
Lastly, there is no need to call wait_on_page_writeback, since
try_to_release_page will not call us with a page in writback state.
Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
---
commit b964638ffd59b61c13f02b81e5118a6e573d91cd
tree 118ab6ba3bceab3ab39d7d22070d03af2ace6f18
parent 387e2b0439026aa738a9edca15a57e5c0bcb4dfc
author Dave Kleikamp <shaggy@austin.ibm.com> Wed, 24 May 2006 07:43:38 -0500
committer Dave Kleikamp <shaggy@austin.ibm.com> Wed, 24 May 2006 07:43:38 -0500
fs/jfs/jfs_metapage.c | 20 +++++---------------
1 files changed, 5 insertions(+), 15 deletions(-)
diff --git a/fs/jfs/jfs_metapage.c b/fs/jfs/jfs_metapage.c
index f28696f..2b220dd 100644
--- a/fs/jfs/jfs_metapage.c
+++ b/fs/jfs/jfs_metapage.c
@@ -542,7 +542,7 @@ add_failed:
static int metapage_releasepage(struct page *page, gfp_t gfp_mask)
{
struct metapage *mp;
- int busy = 0;
+ int ret = 1;
unsigned int offset;
for (offset = 0; offset < PAGE_CACHE_SIZE; offset += PSIZE) {
@@ -552,30 +552,20 @@ static int metapage_releasepage(struct p
continue;
jfs_info("metapage_releasepage: mp = 0x%p", mp);
- if (mp->count || mp->nohomeok) {
+ if (mp->count || mp->nohomeok ||
+ test_bit(META_dirty, &mp->flag)) {
jfs_info("count = %ld, nohomeok = %d", mp->count,
mp->nohomeok);
- busy = 1;
+ ret = 0;
continue;
}
- wait_on_page_writeback(page);
- //WARN_ON(test_bit(META_dirty, &mp->flag));
- if (test_bit(META_dirty, &mp->flag)) {
- dump_mem("dirty mp in metapage_releasepage", mp,
- sizeof(struct metapage));
- dump_mem("page", page, sizeof(struct page));
- dump_stack();
- }
if (mp->lsn)
remove_from_logsync(mp);
remove_metapage(page, mp);
INCREMENT(mpStat.pagefree);
free_metapage(mp);
}
- if (busy)
- return -1;
-
- return 0;
+ return ret;
}
static void metapage_invalidatepage(struct page *page, unsigned long offset)
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [git pull] jfs update
@ 2006-03-20 14:57 Dave Kleikamp
0 siblings, 0 replies; 48+ messages in thread
From: Dave Kleikamp @ 2006-03-20 14:57 UTC (permalink / raw)
To: torvalds; +Cc: linux-kernel
Linus,
I guess the flood gates are open for 2.6.17. :-)
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/Makefile | 3 -
fs/jfs/acl.c | 7 +-
fs/jfs/file.c | 1
fs/jfs/inode.c | 15 ++---
fs/jfs/ioctl.c | 107 ++++++++++++++++++++++++++++++++++++++
fs/jfs/jfs_dinode.h | 31 +++++++++--
fs/jfs/jfs_dmap.c | 8 +-
fs/jfs/jfs_dmap.h | 2
fs/jfs/jfs_dtree.c | 13 ++++
fs/jfs/jfs_extent.c | 20 +++----
fs/jfs/jfs_imap.c | 72 +++++++++++++++++++------
fs/jfs/jfs_imap.h | 4 -
fs/jfs/jfs_incore.h | 10 ++-
fs/jfs/jfs_inode.c | 46 ++++++++++++++--
fs/jfs/jfs_inode.h | 3 +
fs/jfs/jfs_lock.h | 1
fs/jfs/jfs_logmgr.c | 35 ++++--------
fs/jfs/jfs_logmgr.h | 2
fs/jfs/jfs_metapage.c | 3 -
fs/jfs/jfs_superblock.h | 9 +--
fs/jfs/jfs_txnmgr.c | 36 ++++--------
fs/jfs/namei.c | 99 +++++++++++++++++------------------
fs/jfs/super.c | 98 ++++++++++++++++++++--------------
fs/jfs/xattr.c | 8 +-
24 files changed, 429 insertions(+), 204 deletions(-)
through these ChangeSets:
commit c5111f504d2a9b0d258d7c4752b4093523315989
tree 6a52864aff79691689aea21cb0cb928327d5de5b
parent 69eb66d7da7dba2696281981347698e1693c2340
parent a488edc914aa1d766a4e2c982b5ae03d5657ec1b
author Dave Kleikamp <shaggy@austin.ibm.com> Tue, 14 Mar 2006 17:05:45 -0600
committer Dave Kleikamp <shaggy@austin.ibm.com> Tue, 14 Mar 2006 17:05:45 -0600
Merge with /home/shaggy/git/linus-clean/
commit 69eb66d7da7dba2696281981347698e1693c2340
tree ba699dc7a1a80efe159f4a4401b174a7e80779fc
parent be0bf7da19135a7a0f8c275f20c819940be218d9
author Dave Kleikamp <shaggy@austin.ibm.com> Thu, 09 Mar 2006 13:59:30 -0600
committer Dave Kleikamp <shaggy@austin.ibm.com> Thu, 09 Mar 2006 13:59:30 -0600
JFS: add uid, gid, and umask mount options
OS/2 doesn't initialize the uid, gid, or unix-style permission bits. The
uid, gid, & umask mount options perform pretty much like those for the fat
file system, overriding what is stored on disk. This is useful for users
sharing the file system with OS/2.
I implemented a little feature so that if you mask the execute bit, it
will be re-enabled on directories when the appropriate read bit is unmasked.
I didn't want to implement an fmask & dmask option.
Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
commit be0bf7da19135a7a0f8c275f20c819940be218d9
tree c8ba72b711730ce11f52fc20cd7c0e9c4bee7bc0
parent 5b3030e39049212c975665cdb3eeabcfaf7c94ca
author Dave Kleikamp <shaggy@austin.ibm.com> Wed, 08 Mar 2006 10:59:15 -0600
committer Dave Kleikamp <shaggy@austin.ibm.com> Wed, 08 Mar 2006 10:59:15 -0600
JFS: Take logsync lock before testing mp->lsn
This fixes a race where lsn could be cleared before taking the lock
Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
commit 5b3030e39049212c975665cdb3eeabcfaf7c94ca
tree 93742231c2e01087ae36d7c05d8bd7bdb7ca8878
parent d9e902668e815f9f33ba5056089684b0704eeac6
author Eric Sesterhenn <snakebyte@gmx.de> Thu, 23 Feb 2006 09:47:13 -0600
committer Dave Kleikamp <shaggy@austin.ibm.com> Thu, 23 Feb 2006 09:47:13 -0600
JFS: kzalloc conversion
this converts fs/jfs to kzalloc() usage.
compile tested with make allyesconfig
Signed-off-by: Eric Sesterhenn <snakebyte@gmx.de>
Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
commit d9e902668e815f9f33ba5056089684b0704eeac6
tree a2efed26b40b36f38e155955d661f776759a42dc
parent 91dbb4deb30e817efc8d6bed89b1190a489ca776
author Herbert Poetzl <herbert@13thfloor.at> Wed, 22 Feb 2006 14:14:58 -0600
committer Dave Kleikamp <shaggy@austin.ibm.com> Wed, 22 Feb 2006 14:14:58 -0600
JFS: Add missing file from fa3241d24cf1182b0ffb6e4d412c3bc2a2ab7bf6
My mistake here. I failed to checkin fs/jfs/ioctl.c
Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
commit 91dbb4deb30e817efc8d6bed89b1190a489ca776
tree d3742a35be49da1ab785ac398459d7a71a64a765
parent 4837c672fd4d43c519d6b53308ee68d45b91b872
author Christoph Hellwig <hch@lst.de> Wed, 15 Feb 2006 12:49:04 -0600
committer Dave Kleikamp <shaggy@austin.ibm.com> Wed, 15 Feb 2006 12:49:04 -0600
JFS: Use the kthread_ API
Use the kthread_ API instead of opencoding lots of hairy code for kernel
thread creation and teardown.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
commit 4837c672fd4d43c519d6b53308ee68d45b91b872
tree 6aea45f6de8a7320be022ccf5e4c98ddfcf3ea33
parent fa3241d24cf1182b0ffb6e4d412c3bc2a2ab7bf6
author Dave Kleikamp <shaggy@austin.ibm.com> Fri, 10 Feb 2006 08:11:53 -0600
committer Dave Kleikamp <shaggy@austin.ibm.com> Fri, 10 Feb 2006 08:11:53 -0600
JFS: Fix regression. fsck complains if symlinks do not have INLINEEA attribute
Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
commit fa3241d24cf1182b0ffb6e4d412c3bc2a2ab7bf6
tree b39000f89c6699612d64d98fd5739ca7feba8d8f
parent 1de87444f8f91009b726108c9a56600645ee8751
author Herbert Poetzl <herbert@13thfloor.at> Thu, 09 Feb 2006 09:09:16 -0600
committer Dave Kleikamp <shaggy@austin.ibm.com> Thu, 09 Feb 2006 09:09:16 -0600
JFS: ext2 inode attributes for jfs
ext2 inode attributes with relevance for jfs:
'a' EXT2_APPEND_FL -> append only
'i' EXT2_IMMUTABLE_FL -> immutable file
's' EXT2_SECRM_FL -> zero file
'u' EXT2_UNRM_FL -> allow for unrm
'A' EXT2_NOATIME_FL -> no access time
'D' EXT2_DIRSYNC_FL -> dirsync
'S' EXT2_SYNC_FL -> sync
overview of jfs flags (partially for OS/2)
value (OS/2) Linux ext2 attrs
------------------------------------------------
0x00010000 IFJOURNAL -
0x00020000 ISPARSE used
0x00040000 INLINEEA used
0x00080000 - - JFS_NOATIME_FL
0x00100000 - - JFS_DIRSYNC_FL
0x00200000 - - JFS_SYNC_FL
0x00400000 - - JFS_SECRM_FL
0x00800000 ISWAPFILE - JFS_UNRM_FL
0x01000000 - - JFS_APPEND_FL
0x02000000 IREADONLY - JFS_IMMUTABLE_FL
0x04000000 IHIDDEN - -
0x08000000 ISYSTEM - -
0x10000000 - -
0x20000000 IDIRECTORY used
0x40000000 IARCHIVE -
0x80000000 INEWNAME -
the implementation is straight forward, except
for the fact that the attributes have to be mapped
to match with the ext2 ones to avoid a separate
tool for manipulating them (this could be avoided
when using a separate flag field in the on-disk
representation, but the overhead is minimal)
a special jfs_ioctl is added to allow for the new
JFS_IOC_GETFLAGS and JFS_IOC_SETFLAGS calls.
a helper function jfs_set_inode_flags() to transfer
the flags from the on-disk version to the inode
minor changes to allow flag inheritance on inode
creation, as well as a cleanup of the on-disk
flags (including the new ones)
beforementioned helper to map between ext2 and jfs
versions of the new flags ...
the JFS_SECRM_FL and JFS_UNRM_FL are not done yet
and I'm not 100% sure they are worth the effort,
the rest seems to work out of the box ...
Signed-off-by: Herbert Poetzl <herbert@13thfloor.at>
Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
commit 1de87444f8f91009b726108c9a56600645ee8751
tree 66f731a701a005be55337792bf873c182470141a
parent 0a0fc0ddbe732779366ab6b1b879f62195e65967
author Ingo Molnar <mingo@elte.hu> Tue, 24 Jan 2006 15:22:50 -0600
committer Dave Kleikamp <shaggy@austin.ibm.com> Tue, 24 Jan 2006 15:22:50 -0600
JFS: semaphore to mutex conversion.
the conversion was generated via scripts, and the result was validated
automatically via a script as well.
build and boot tested.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
commit 0a0fc0ddbe732779366ab6b1b879f62195e65967
tree 7b42490a676cf39ae0691b6859ecf7fd410f229b
parent 4d5dbd0945d9e0833dd7964a3d6ee33157f7cc7a
parent 3ee68c4af3fd7228c1be63254b9f884614f9ebb2
author Dave Kleikamp <shaggy@austin.ibm.com> Tue, 24 Jan 2006 14:34:47 -0600
committer Dave Kleikamp <shaggy@austin.ibm.com> Tue, 24 Jan 2006 14:34:47 -0600
Merge with /home/shaggy/git/linus-clean/
commit 4d5dbd0945d9e0833dd7964a3d6ee33157f7cc7a
tree 139d47bcbfbbca350536be935961fece7477a7b6
parent ca869912366f60cb5e0bdd09f65e80ee6816e73c
author Arjan van de Ven <arjan@infradead.org> Tue, 29 Nov 2005 08:28:58 -0600
committer Dave Kleikamp <shaggy@austin.ibm.com> Tue, 29 Nov 2005 08:28:58 -0600
JFS: make buddy table static
Idea is to reduce false cacheline sharing and stuff
Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
commit ca869912366f60cb5e0bdd09f65e80ee6816e73c
tree a72913a29495ca078987c09fc0008f47e11b900b
parent dd8a306ac0c918268bd2ae89da2dea627f6e352d
parent 388f7ef720a982f49925e7b4e96f216f208f8c03
author Dave Kleikamp <shaggy@austin.ibm.com> Fri, 11 Nov 2005 14:09:06 -0600
committer Dave Kleikamp <shaggy@austin.ibm.com> Fri, 11 Nov 2005 14:09:06 -0600
Merge with /home/shaggy/git/linus-clean/
commit dd8a306ac0c918268bd2ae89da2dea627f6e352d
tree e3f2c244505931d93b09f7d314014cf3832b0176
parent 3b44f137b9a846c5452d9e6e1271b79b1dbcc942
author Dave Kleikamp <shaggy@austin.ibm.com> Thu, 10 Nov 2005 07:50:03 -0600
committer Dave Kleikamp <shaggy@austin.ibm.com> Thu, 10 Nov 2005 07:50:03 -0600
JFS: Add back directory i_size calculations for legacy partitions
Linux-formatted jfs partitions have a different idea about what i_size
represents than partitions formatted on OS/2. The i_size calculation is
now based on the size of the directory index. For legacy partitions, which
have no directory index, the i_size is never being updated.
This patch adds back the original i_size calculations for legacy partitions.
Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
^ permalink raw reply [flat|nested] 48+ messages in thread
* Re: [git pull] jfs update
2006-03-14 18:47 Dave Kleikamp
@ 2006-03-14 19:33 ` Linus Torvalds
0 siblings, 0 replies; 48+ messages in thread
From: Linus Torvalds @ 2006-03-14 19:33 UTC (permalink / raw)
To: Dave Kleikamp; +Cc: linux-kernel
On Tue, 14 Mar 2006, Dave Kleikamp wrote:
>
> I'd really like the first of these patches (first in the list, but the most
> recent) to make it into 2.6.16. All of these patches have been tested in
> -mm, so I'm confident that they won't break anything. If you don't want to
> pick up all of them, I could send you just the one patch.
At this point in the game, I'd rather take just individual patches known
to fix particular bugs..
It's ok if the patches come in through a git tree, but the particular git
tree you pointed to has other diffs that definitely look like fine
cleanups, but still they're just cleanups.
Linus
^ permalink raw reply [flat|nested] 48+ messages in thread
* [git pull] jfs update
@ 2006-03-14 18:47 Dave Kleikamp
2006-03-14 19:33 ` Linus Torvalds
0 siblings, 1 reply; 48+ messages in thread
From: Dave Kleikamp @ 2006-03-14 18:47 UTC (permalink / raw)
To: torvalds; +Cc: linux-kernel
Linus,
I'd really like the first of these patches (first in the list, but the most
recent) to make it into 2.6.16. All of these patches have been tested in
-mm, so I'm confident that they won't break anything. If you don't want to
pick up all of them, I could send you just the one patch.
Thanks,
Shaggy
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/Makefile | 3 -
fs/jfs/acl.c | 4 -
fs/jfs/file.c | 1
fs/jfs/inode.c | 15 ++---
fs/jfs/ioctl.c | 107 ++++++++++++++++++++++++++++++++++++++
fs/jfs/jfs_dinode.h | 31 +++++++++--
fs/jfs/jfs_dmap.c | 15 ++---
fs/jfs/jfs_dmap.h | 2
fs/jfs/jfs_dtree.c | 13 ++++
fs/jfs/jfs_extent.c | 20 +++----
fs/jfs/jfs_imap.c | 28 ++++-----
fs/jfs/jfs_imap.h | 4 -
fs/jfs/jfs_incore.h | 5 +
fs/jfs/jfs_inode.c | 39 ++++++++++++-
fs/jfs/jfs_inode.h | 3 +
fs/jfs/jfs_lock.h | 1
fs/jfs/jfs_logmgr.c | 35 ++++--------
fs/jfs/jfs_logmgr.h | 2
fs/jfs/jfs_metapage.c | 3 -
fs/jfs/jfs_superblock.h | 9 +--
fs/jfs/jfs_txnmgr.c | 36 ++++--------
fs/jfs/namei.c | 99 +++++++++++++++++------------------
fs/jfs/super.c | 60 ++++++++-------------
fs/jfs/xattr.c | 8 +-
24 files changed, 340 insertions(+), 203 deletions(-)
through these ChangeSets:
commit be0bf7da19135a7a0f8c275f20c819940be218d9
tree c8ba72b711730ce11f52fc20cd7c0e9c4bee7bc0
parent 5b3030e39049212c975665cdb3eeabcfaf7c94ca
author Dave Kleikamp <shaggy@austin.ibm.com> Wed, 08 Mar 2006 10:59:15 -0600
committer Dave Kleikamp <shaggy@austin.ibm.com> Wed, 08 Mar 2006 10:59:15 -0600
JFS: Take logsync lock before testing mp->lsn
This fixes a race where lsn could be cleared before taking the lock
Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
commit 5b3030e39049212c975665cdb3eeabcfaf7c94ca
tree 93742231c2e01087ae36d7c05d8bd7bdb7ca8878
parent d9e902668e815f9f33ba5056089684b0704eeac6
author Eric Sesterhenn <snakebyte@gmx.de> Thu, 23 Feb 2006 09:47:13 -0600
committer Dave Kleikamp <shaggy@austin.ibm.com> Thu, 23 Feb 2006 09:47:13 -0600
JFS: kzalloc conversion
this converts fs/jfs to kzalloc() usage.
compile tested with make allyesconfig
Signed-off-by: Eric Sesterhenn <snakebyte@gmx.de>
Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
commit d9e902668e815f9f33ba5056089684b0704eeac6
tree a2efed26b40b36f38e155955d661f776759a42dc
parent 91dbb4deb30e817efc8d6bed89b1190a489ca776
author Herbert Poetzl <herbert@13thfloor.at> Wed, 22 Feb 2006 14:14:58 -0600
committer Dave Kleikamp <shaggy@austin.ibm.com> Wed, 22 Feb 2006 14:14:58 -0600
JFS: Add missing file from fa3241d24cf1182b0ffb6e4d412c3bc2a2ab7bf6
My mistake here. I failed to checkin fs/jfs/ioctl.c
Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
commit 91dbb4deb30e817efc8d6bed89b1190a489ca776
tree d3742a35be49da1ab785ac398459d7a71a64a765
parent 4837c672fd4d43c519d6b53308ee68d45b91b872
author Christoph Hellwig <hch@lst.de> Wed, 15 Feb 2006 12:49:04 -0600
committer Dave Kleikamp <shaggy@austin.ibm.com> Wed, 15 Feb 2006 12:49:04 -0600
JFS: Use the kthread_ API
Use the kthread_ API instead of opencoding lots of hairy code for kernel
thread creation and teardown.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
commit 4837c672fd4d43c519d6b53308ee68d45b91b872
tree 6aea45f6de8a7320be022ccf5e4c98ddfcf3ea33
parent fa3241d24cf1182b0ffb6e4d412c3bc2a2ab7bf6
author Dave Kleikamp <shaggy@austin.ibm.com> Fri, 10 Feb 2006 08:11:53 -0600
committer Dave Kleikamp <shaggy@austin.ibm.com> Fri, 10 Feb 2006 08:11:53 -0600
JFS: Fix regression. fsck complains if symlinks do not have INLINEEA attribute
Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
commit fa3241d24cf1182b0ffb6e4d412c3bc2a2ab7bf6
tree b39000f89c6699612d64d98fd5739ca7feba8d8f
parent 1de87444f8f91009b726108c9a56600645ee8751
author Herbert Poetzl <herbert@13thfloor.at> Thu, 09 Feb 2006 09:09:16 -0600
committer Dave Kleikamp <shaggy@austin.ibm.com> Thu, 09 Feb 2006 09:09:16 -0600
JFS: ext2 inode attributes for jfs
ext2 inode attributes with relevance for jfs:
'a' EXT2_APPEND_FL -> append only
'i' EXT2_IMMUTABLE_FL -> immutable file
's' EXT2_SECRM_FL -> zero file
'u' EXT2_UNRM_FL -> allow for unrm
'A' EXT2_NOATIME_FL -> no access time
'D' EXT2_DIRSYNC_FL -> dirsync
'S' EXT2_SYNC_FL -> sync
overview of jfs flags (partially for OS/2)
value (OS/2) Linux ext2 attrs
------------------------------------------------
0x00010000 IFJOURNAL -
0x00020000 ISPARSE used
0x00040000 INLINEEA used
0x00080000 - - JFS_NOATIME_FL
0x00100000 - - JFS_DIRSYNC_FL
0x00200000 - - JFS_SYNC_FL
0x00400000 - - JFS_SECRM_FL
0x00800000 ISWAPFILE - JFS_UNRM_FL
0x01000000 - - JFS_APPEND_FL
0x02000000 IREADONLY - JFS_IMMUTABLE_FL
0x04000000 IHIDDEN - -
0x08000000 ISYSTEM - -
0x10000000 - -
0x20000000 IDIRECTORY used
0x40000000 IARCHIVE -
0x80000000 INEWNAME -
the implementation is straight forward, except
for the fact that the attributes have to be mapped
to match with the ext2 ones to avoid a separate
tool for manipulating them (this could be avoided
when using a separate flag field in the on-disk
representation, but the overhead is minimal)
a special jfs_ioctl is added to allow for the new
JFS_IOC_GETFLAGS and JFS_IOC_SETFLAGS calls.
a helper function jfs_set_inode_flags() to transfer
the flags from the on-disk version to the inode
minor changes to allow flag inheritance on inode
creation, as well as a cleanup of the on-disk
flags (including the new ones)
beforementioned helper to map between ext2 and jfs
versions of the new flags ...
the JFS_SECRM_FL and JFS_UNRM_FL are not done yet
and I'm not 100% sure they are worth the effort,
the rest seems to work out of the box ...
Signed-off-by: Herbert Poetzl <herbert@13thfloor.at>
Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
commit 1de87444f8f91009b726108c9a56600645ee8751
tree 66f731a701a005be55337792bf873c182470141a
parent 0a0fc0ddbe732779366ab6b1b879f62195e65967
author Ingo Molnar <mingo@elte.hu> Tue, 24 Jan 2006 15:22:50 -0600
committer Dave Kleikamp <shaggy@austin.ibm.com> Tue, 24 Jan 2006 15:22:50 -0600
JFS: semaphore to mutex conversion.
the conversion was generated via scripts, and the result was validated
automatically via a script as well.
build and boot tested.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
commit 0a0fc0ddbe732779366ab6b1b879f62195e65967
tree 7b42490a676cf39ae0691b6859ecf7fd410f229b
parent 4d5dbd0945d9e0833dd7964a3d6ee33157f7cc7a
parent 3ee68c4af3fd7228c1be63254b9f884614f9ebb2
author Dave Kleikamp <shaggy@austin.ibm.com> Tue, 24 Jan 2006 14:34:47 -0600
committer Dave Kleikamp <shaggy@austin.ibm.com> Tue, 24 Jan 2006 14:34:47 -0600
Merge with /home/shaggy/git/linus-clean/
commit 4d5dbd0945d9e0833dd7964a3d6ee33157f7cc7a
tree 139d47bcbfbbca350536be935961fece7477a7b6
parent ca869912366f60cb5e0bdd09f65e80ee6816e73c
author Arjan van de Ven <arjan@infradead.org> Tue, 29 Nov 2005 08:28:58 -0600
committer Dave Kleikamp <shaggy@austin.ibm.com> Tue, 29 Nov 2005 08:28:58 -0600
JFS: make buddy table static
Idea is to reduce false cacheline sharing and stuff
Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
commit ca869912366f60cb5e0bdd09f65e80ee6816e73c
tree a72913a29495ca078987c09fc0008f47e11b900b
parent dd8a306ac0c918268bd2ae89da2dea627f6e352d
parent 388f7ef720a982f49925e7b4e96f216f208f8c03
author Dave Kleikamp <shaggy@austin.ibm.com> Fri, 11 Nov 2005 14:09:06 -0600
committer Dave Kleikamp <shaggy@austin.ibm.com> Fri, 11 Nov 2005 14:09:06 -0600
Merge with /home/shaggy/git/linus-clean/
commit dd8a306ac0c918268bd2ae89da2dea627f6e352d
tree e3f2c244505931d93b09f7d314014cf3832b0176
parent 3b44f137b9a846c5452d9e6e1271b79b1dbcc942
author Dave Kleikamp <shaggy@austin.ibm.com> Thu, 10 Nov 2005 07:50:03 -0600
committer Dave Kleikamp <shaggy@austin.ibm.com> Thu, 10 Nov 2005 07:50:03 -0600
JFS: Add back directory i_size calculations for legacy partitions
Linux-formatted jfs partitions have a different idea about what i_size
represents than partitions formatted on OS/2. The i_size calculation is
now based on the size of the directory index. For legacy partitions, which
have no directory index, the i_size is never being updated.
This patch adds back the original i_size calculations for legacy partitions.
Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
^ permalink raw reply [flat|nested] 48+ messages in thread
* [git pull] jfs update
@ 2005-11-09 21:40 Dave Kleikamp
0 siblings, 0 replies; 48+ messages in thread
From: Dave Kleikamp @ 2005-11-09 21:40 UTC (permalink / raw)
To: torvalds; +Cc: linux-kernel
Linus, one more.
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/namei.c | 3 +++
1 file changed, 3 insertions(+)
through these ChangeSets:
commit 988a6490a793b73ff23aa3baf87b337152178e4d
tree c12631ad5e0914d52434ea7443bb053103411cd7
parent f2c84c0e84bfa637a7161eac10157cf3b05b4a73
author Dave Kleikamp <shaggy@austin.ibm.com> Mon, 31 Oct 2005 16:53:04 -0600
committer Dave Kleikamp <shaggy@austin.ibm.com> Mon, 31 Oct 2005 16:53:04 -0600
JFS: set i_ctime & i_mtime on target directory when creating links
jfs has never been setting i_ctime or i_mtime when creating either hard
or symbolic links. I'm surprised nobody had noticed until now.
Thanks to Chris Spiegel for reporting the problem.
Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
^ permalink raw reply [flat|nested] 48+ messages in thread
* [git pull] jfs update
@ 2005-10-28 19:12 Dave Kleikamp
0 siblings, 0 replies; 48+ messages in thread
From: Dave Kleikamp @ 2005-10-28 19:12 UTC (permalink / raw)
To: torvalds; +Cc: linux-kernel
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/jfs_dmap.c | 20 ++++++++++++++------
fs/jfs/jfs_imap.c | 10 ++++++++--
fs/jfs/jfs_metapage.c | 6 ++++++
fs/jfs/jfs_txnmgr.c | 2 --
fs/jfs/jfs_xtree.c | 18 +++++++++---------
fs/jfs/super.c | 1 +
6 files changed, 38 insertions(+), 19 deletions(-)
through these ChangeSets:
commit 7038f1cbac899654cf0515e60dbe3e44d58271de
tree 73909f95989f10bd85929073395e494ceb1a6b3f
parent b6a47fd8ff08a9d5cd279cdb8d97a619983575fa
author Dave Kleikamp <shaggy@austin.ibm.com> Fri, 28 Oct 2005 13:27:40 -0500
committer Dave Kleikamp <shaggy@austin.ibm.com> Fri, 28 Oct 2005 13:27:40 -0500
JFS: make sure right-most xtree pages have header.next set to zero
The xtTruncate code was only doing this for leaf pages. When a file is
horribly fragmented, we may truncate a file leaving an internal page with
an invalid head.next field, which may cause a stale page to be referenced.
Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
commit b6a47fd8ff08a9d5cd279cdb8d97a619983575fa
tree 5e946b5a7c3f224d181525ca475fd3f29508c47d
parent ac17b8b57013a3e38d1958f66a218f15659e5752
author Dave Kleikamp <shaggy@austin.ibm.com> Tue, 11 Oct 2005 09:06:59 -0500
committer Dave Kleikamp <shaggy@austin.ibm.com> Tue, 11 Oct 2005 09:06:59 -0500
JFS: Corrupted block map should not cause trap
Replace assert statements with better error handling.
Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
commit ac17b8b57013a3e38d1958f66a218f15659e5752
tree f7a28ccd5bd5496f6a2284f3d77a5019dc75c820
parent ddea7be0ec8d1374f0b483a81566ed56ec9f3905
author Dave Kleikamp <shaggy@austin.ibm.com> Mon, 03 Oct 2005 15:32:11 -0500
committer Dave Kleikamp <shaggy@austin.ibm.com> Mon, 03 Oct 2005 15:32:11 -0500
JFS: make special inodes play nicely with page balancing
This patch fixes up a few problems with jfs's reserved inodes.
1. There is no need for the jfs code setting the I_DIRTY bits in i_state.
I am ashamed that the code ever did this, and surprised it hasn't been
noticed until now.
2. Make sure special inodes are on an inode hash list. If the inodes are
unhashed, __mark_inode_dirty will fail to put the inode on the
superblock's dirty list, and the data will not be flushed under memory
pressure.
3. Force writing journal data to disk when metapage_writepage is unable to
write a metadata page due to pending journal I/O.
Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
^ permalink raw reply [flat|nested] 48+ messages in thread
* [git pull] jfs update
@ 2005-08-04 21:07 Dave Kleikamp
0 siblings, 0 replies; 48+ messages in thread
From: Dave Kleikamp @ 2005-08-04 21:07 UTC (permalink / raw)
To: torvalds; +Cc: linux-kernel
Linus, if there is still time to get this into 2.6.13, please pull from
rsync://rsync.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6.git for-linus
I'm experimenting with a sparse git tree, so if it fails, that's probably why.
I was able to pull from it, so I expect it to work.
This will update the following files:
fs/jfs/inode.c | 4 ++++
fs/jfs/jfs_logmgr.c | 36 +++++++++++++++++++-----------------
fs/jfs/jfs_logmgr.h | 2 +-
fs/jfs/jfs_txnmgr.c | 10 +++++-----
fs/jfs/super.c | 2 +-
5 files changed, 30 insertions(+), 24 deletions(-)
through these ChangeSets:
commit a5c96cab8f3c4ca9b2177dceb5de5a0edb31418e
tree 45692a1b3d770f721f4586ad81c206f1b8509b75
parent 30db1ae8640d3527ca7ac8df4bcbf14ccc6ae9cd
parent 1c5ad84516ae7ea4ec868436a910a6bd8d20215a
author Dave Kleikamp <shaggy@austin.ibm.com> Thu, 04 Aug 2005 15:56:15 -0500
committer Dave Kleikamp <shaggy@austin.ibm.com> Thu, 04 Aug 2005 15:56:15 -0500
Merge with /home/shaggy/git/linus-clean/
Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
commit 30db1ae8640d3527ca7ac8df4bcbf14ccc6ae9cd
tree f42fc0f8fc07dcd0c2cc15aa31566a321a8f2a30
parent da28c12089dfcfb8695b6b555cdb8e03dda2b690
author Dave Kleikamp <shaggy@austin.ibm.com> Mon, 01 Aug 2005 16:54:26 -0500
committer Dave Kleikamp <shaggy@austin.ibm.com> Mon, 01 Aug 2005 16:54:26 -0500
JFS: Check for invalid inodes in jfs_delete_inode
Some error paths may iput an invalid inode with i_nlink=0. jfs should
not try to actually delete such an inode.
Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
commit da28c12089dfcfb8695b6b555cdb8e03dda2b690
tree b3ff509f21352ef053cb3d490cb13528090d32ac
parent 6de7dc2c4c713d037c19aa1e310d240f16973414
parent 577a4f8102d54b504cb22eb021b89e957e8df18f
author Dave Kleikamp <shaggy@austin.ibm.com> Thu, 28 Jul 2005 09:03:36 -0500
committer Dave Kleikamp <shaggy@austin.ibm.com> Thu, 28 Jul 2005 09:03:36 -0500
Merge with /home/shaggy/git/linus-clean/
/home/shaggy/git/linus-clean/
/home/shaggy/git/linus-clean/
Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
commit 6de7dc2c4c713d037c19aa1e310d240f16973414
tree 68963db8081e6ef18affd06cf2e9b00578ef874e
parent cbc3d65ebcb0c494183d45cf202a53352cbf3871
parent 9e566d8bd61f939b7f5d7d969f5b178571471cf9
author Dave Kleikamp <shaggy@austin.ibm.com> Wed, 27 Jul 2005 12:50:08 -0500
committer Dave Kleikamp <shaggy@austin.ibm.com> Wed, 27 Jul 2005 12:50:08 -0500
Merge with /home/shaggy/git/linus-clean/
Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
commit cbc3d65ebcb0c494183d45cf202a53352cbf3871
tree 4f05bef55fd76ddd7668187e84e7fbc16a4849f6
parent de8fd087b280797977b012a4275ee53ff2999f3f
author Dave Kleikamp <shaggy@austin.ibm.com> Wed, 27 Jul 2005 09:17:57 -0500
committer Dave Kleikamp <shaggy@austin.ibm.com> Wed, 27 Jul 2005 09:17:57 -0500
JFS: Improve sync barrier processing
Under heavy load, hot metadata pages are often locked by non-committed
transactions, making them difficult to flush to disk. This prevents
the sync point from advancing past a transaction that had modified the
page.
There is a point during the sync barrier processing where all
outstanding transactions have been committed to disk, but no new
transaction have been allowed to proceed. This is the best time
to write the metadata.
Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
commit de8fd087b280797977b012a4275ee53ff2999f3f
tree 5cd65289983ad65812a6a4335fe657eeb125a7f0
parent 18190cc08d70a6ec8ef69f0f6ede021f7cb3f9b8
parent 6b6a93c6876ea1c530d5d3f68e3678093a27fab0
author Dave Kleikamp <shaggy@austin.ibm.com> Tue, 26 Jul 2005 09:55:10 -0500
committer Dave Kleikamp <shaggy@austin.ibm.com> Tue, 26 Jul 2005 09:55:10 -0500
Merge with /home/shaggy/git/linus-clean/
Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
^ permalink raw reply [flat|nested] 48+ messages in thread
* Re: [git pull] jfs update
2005-07-27 18:05 Dave Kleikamp
@ 2005-07-27 23:43 ` Linus Torvalds
0 siblings, 0 replies; 48+ messages in thread
From: Linus Torvalds @ 2005-07-27 23:43 UTC (permalink / raw)
To: Dave Kleikamp; +Cc: linux-kernel
On Wed, 27 Jul 2005, Dave Kleikamp wrote:
>
> Linus, please pull from
>
> rsync://rsync.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6.git/HEAD-for-linus
Please use the format "repo branch" in your pull requests, ie since the
real branch is called "for-linus", just say
rsync://rsync.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6.git for-linus
which ends up being the syntax I have to use anyway ;)
Linus
^ permalink raw reply [flat|nested] 48+ messages in thread
* [git pull] jfs update
@ 2005-07-27 18:05 Dave Kleikamp
2005-07-27 23:43 ` Linus Torvalds
0 siblings, 1 reply; 48+ messages in thread
From: Dave Kleikamp @ 2005-07-27 18:05 UTC (permalink / raw)
To: torvalds; +Cc: linux-kernel
Linus, please pull from
rsync://rsync.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6.git/HEAD-for-linus
This will update the following files:
fs/jfs/jfs_dmap.c | 46 ++++++++++++++++++++++++++++++----------------
fs/jfs/jfs_dtree.c | 13 +++++++++----
fs/jfs/jfs_logmgr.c | 3 ++-
fs/jfs/jfs_metapage.c | 11 +----------
4 files changed, 42 insertions(+), 31 deletions(-)
through these ChangeSets:
commit 18190cc08d70a6ec8ef69f0f6ede021f7cb3f9b8
tree 5e1d35d247e5ddd549283e0d71bb7810c04b02f1
parent c2783f3a625b2aba943ef94623e277557a91a448
author Dave Kleikamp <shaggy@austin.ibm.com> Tue, 26 Jul 2005 09:29:13 -0500
committer Dave Kleikamp <shaggy@austin.ibm.com> Tue, 26 Jul 2005 09:29:13 -0500
JFS: Fix i_blocks accounting when allocation fails
A failure in dbAlloc caused a directory's i_blocks to be incorrectly
incremented, causing jfs_fsck to find the inode to be corrupt.
Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
commit c2783f3a625b2aba943ef94623e277557a91a448
tree e262b750f4e8cd5785417a55dd68b427e31bd86f
parent c40c202493d18de42fcd0b8b5d68c22aefb70f03
author Dave Kleikamp <shaggy@austin.ibm.com> Mon, 25 Jul 2005 08:58:54 -0500
committer Dave Kleikamp <shaggy@austin.ibm.com> Mon, 25 Jul 2005 08:58:54 -0500
JFS: Don't set log_SYNCBARRIER when log->active == 0
If a metadata page is kept active, it is possible that the sync barrier logic
continues to trigger, even if all active transactions have been phyically
written to the journal. This can cause a hang, since the completion of the
journal I/O is what unsets the sync barrier flag to allow new transactions
to be created.
Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
commit c40c202493d18de42fcd0b8b5d68c22aefb70f03
tree f8629741d3e049ca8fe7893bd1f089f82ef05611
parent 21d1ee8b375bcd180f1d6b8ccbb8d8f938596310
author Dave Kleikamp <shaggy@austin.ibm.com> Fri, 22 Jul 2005 11:08:44 -0500
committer Dave Kleikamp <shaggy@austin.ibm.com> Fri, 22 Jul 2005 11:08:44 -0500
JFS: Fix typo in last patch
Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
commit 21d1ee8b375bcd180f1d6b8ccbb8d8f938596310
tree 2e82b65c16a4aaa88eeb7dd9f47f2d1c418e77d0
parent 3d9b1cdd2455017c6aa25bc2442092b81438981f
parent f60f700876cd51de9de69f3a3c865d95e287a24d
author Dave Kleikamp <shaggy@austin.ibm.com> Tue, 19 Jul 2005 13:46:53 -0500
committer Dave Kleikamp <shaggy@austin.ibm.com> Tue, 19 Jul 2005 13:46:53 -0500
Merge with /home/shaggy/git/linus-clean/
Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
commit 3d9b1cdd2455017c6aa25bc2442092b81438981f
tree 0f0bf8deaeabc2d14fbded203392ec5bf7dc37ad
parent 56d1254917d9f301a8e24155cd3f2236e642cb7d
author Qu Fuping <qufuping@ercist.iscas.ac.cn> Fri, 15 Jul 2005 10:36:08 -0500
committer Dave Kleikamp <shaggy@austin.ibm.com> Fri, 15 Jul 2005 10:36:08 -0500
JFS: fsync wrong behavior when I/O failure occurs
This is half of a patch that Qu Fuping submitted in April. The first part
was applied to fs/mpage.c in 2.6.12-rc4.
jfs_fsync should return error, but it doesn't wait for the metadata page to
be uptodate, e.g.:
jfs_fsync->jfs_commit_inode->txCommit->diWrite->read_metapage->
__get_metapage->read_cache_page reads a page from disk. Because read is
async, when read_cache_page: err = filler(data, page), filler will not
return error, it just submits I/O request and returns. So, page is not
uptodate. Checking only if(IS_ERROR(mp->page)) is not enough, we should
add "|| !PageUptodate(mp->page)"
Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
commit 56d1254917d9f301a8e24155cd3f2236e642cb7d
tree 63b6881444c37e73caf039ebfdbfc9edece87aa6
parent 00be3e7e5cc3ca80e035b387e883d5ec10d7b897
author Dave Kleikamp <shaggy@austin.ibm.com> Fri, 15 Jul 2005 09:43:36 -0500
committer Dave Kleikamp <shaggy@austin.ibm.com> Fri, 15 Jul 2005 09:43:36 -0500
JFS: Remove assert statement in dbJoin & return -EIO instead
Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
commit 00be3e7e5cc3ca80e035b387e883d5ec10d7b897
tree 916ae70cead5b9a15afe2e6cc9f453b153e8bf3e
parent ba460e48064edeb57e3398eb8972c58de33f11ea
author Dave Kleikamp <shaggy@austin.ibm.com> Thu, 14 Jul 2005 15:15:39 -0500
committer Dave Kleikamp <shaggy@austin.ibm.com> Thu, 14 Jul 2005 15:15:39 -0500
JFS: Remove bogus WARN_ON statement and some dead code
Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
^ permalink raw reply [flat|nested] 48+ messages in thread
* [git pull] jfs update
@ 2005-07-13 14:41 Dave Kleikamp
0 siblings, 0 replies; 48+ messages in thread
From: Dave Kleikamp @ 2005-07-13 14:41 UTC (permalink / raw)
To: torvalds; +Cc: linux-kernel
Linus, please pull from
rsync://rsync.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6.git/HEAD-for-linus
This will update the following files:
fs/jfs/jfs_dmap.c | 298 +-------------------------------------------
fs/jfs/jfs_dtree.c | 199 -----------------------------
fs/jfs/jfs_dtree.h | 7 -
fs/jfs/jfs_imap.c | 105 ---------------
fs/jfs/jfs_unicode.c | 7 -
fs/jfs/jfs_xtree.c | 340 ---------------------------------------------------
fs/jfs/jfs_xtree.h | 6
fs/jfs/xattr.c | 6
8 files changed, 15 insertions(+), 953 deletions(-)
through these ChangeSets:
commit 59192ed9e7aa81b06a1803661419f7261afca1ad
tree 31f592365ad2ecf5eb606de10290da502fc7eb74
parent 6211502d7ee9e515e4458d0c0ebfbb70553dc7de
author Ian Dall <ian@beware.dropbear.id.au> Wed, 13 Jul 2005 09:15:18 -0500
committer Dave Kleikamp <shaggy@austin.ibm.com> Wed, 13 Jul 2005 09:15:18 -0500
JFS: Need to be root to create files with security context
It turns out this is due to some inverted logic in xattr.c
Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
commit 6211502d7ee9e515e4458d0c0ebfbb70553dc7de
tree 24ab6b567f793f8dd1c1e3458769290df2bf8f52
parent f7f24758ac98a506770bc5910d33567610fa3403
author Dave Kleikamp <shaggy@austin.ibm.com> Wed, 13 Jul 2005 09:07:53 -0500
committer Dave Kleikamp <shaggy@austin.ibm.com> Wed, 13 Jul 2005 09:07:53 -0500
JFS: Allow security.* xattrs to be set on symlinks
All of the different xattr namespaces have different rules.
user.* and ACL's are not allowed on symlinks, and since these were the
first xattrs implemented, I assumed there was no need to support xattrs
on symlinks. This one-line patch should fix it.
Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
commit f7f24758ac98a506770bc5910d33567610fa3403
tree ff7fad3d01bf9dc2e2e54b908f9fca4891e1ee72
parent b38a3ab3d1bb0dc3288f73903d4dc4672b5cd2d0
parent c32511e2718618f0b53479eb36e07439aa363a74
author Dave Kleikamp <shaggy@austin.ibm.com> Wed, 13 Jul 2005 08:57:38 -0500
committer Dave Kleikamp <shaggy@austin.ibm.com> Wed, 13 Jul 2005 08:57:38 -0500
Merge with /home/shaggy/git/linus-clean/
Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
commit b38a3ab3d1bb0dc3288f73903d4dc4672b5cd2d0
tree 31d017dd1f9f4a8ca3e80d25d110c64ae82d4aae
parent f5f287738bddf38ec9ca79344f00dab675e1bbf5
author Dave Kleikamp <shaggy@austin.ibm.com> Mon, 27 Jun 2005 15:35:37 -0500
committer Dave Kleikamp <shaggy@austin.ibm.com> Mon, 27 Jun 2005 15:35:37 -0500
JFS: Code cleanup - getting rid of never-used debug code
I'm finally getting around to cleaning out debug code that I've never used.
There has always been code ifdef'ed out by _JFS_DEBUG_DMAP, _JFS_DEBUG_IMAP,
_JFS_DEBUG_DTREE, and _JFS_DEBUG_XTREE, which I have personally never used,
and I doubt that anyone has since the design stage back in OS/2. There is
also a function, xtGather, that has never been used, and I don't know why it
was ever there.
Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
commit f5f287738bddf38ec9ca79344f00dab675e1bbf5
tree c8144a3906f6904f7cf18c4520976c79a1e15b0a
parent a8ad86f2dc46356f87be1327dabc18bdbda32f50
author Sonny Rao <sonny@burdell.org> Thu, 23 Jun 2005 16:57:56 -0500
committer Dave Kleikamp <shaggy@austin.ibm.com> Thu, 23 Jun 2005 16:57:56 -0500
JFS: performance patch
Basically, we saw a large amount of time spent in the
jfs_strfromUCS_le() function, mispredicting the branch inside the
loop, so I just added some unlikely modifiers to the if statements to
re-ordered the code. Again, these simple changes provided > 2 % on
spec-sfs, so please consider it for inclusion.
Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
^ permalink raw reply [flat|nested] 48+ messages in thread
* [git pull] jfs update
@ 2005-06-20 16:18 Dave Kleikamp
0 siblings, 0 replies; 48+ messages in thread
From: Dave Kleikamp @ 2005-06-20 16:18 UTC (permalink / raw)
To: torvalds; +Cc: linux-kernel
Linus, please pull from
rsync://rsync.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6.git/HEAD-for-linus
This will update the following files:
fs/jfs/acl.c | 6 +----
fs/jfs/file.c | 9 ++------
fs/jfs/inode.c | 11 +---------
fs/jfs/jfs_debug.c | 10 ---------
fs/jfs/jfs_debug.h | 15 ++++++++++----
fs/jfs/jfs_dmap.c | 9 --------
fs/jfs/jfs_dtree.c | 3 ++
fs/jfs/jfs_extent.c | 7 ------
fs/jfs/jfs_imap.c | 6 -----
fs/jfs/jfs_inode.c | 1
fs/jfs/jfs_inode.h | 19 +++++++++++++++++-
fs/jfs/jfs_logmgr.c | 14 +++----------
fs/jfs/jfs_logmgr.h | 2 +
fs/jfs/jfs_metapage.c | 6 ++---
fs/jfs/jfs_metapage.h | 6 +++--
fs/jfs/jfs_superblock.h | 11 ++++++++++
fs/jfs/jfs_txnmgr.c | 40 --------------------------------------
fs/jfs/jfs_txnmgr.h | 50 ++++++++++++++++++++----------------------------
fs/jfs/namei.c | 28 +++++---------------------
fs/jfs/super.c | 37 -----------------------------------
fs/jfs/symlink.c | 3 +-
fs/jfs/xattr.c | 6 +----
22 files changed, 99 insertions(+), 200 deletions(-)
through these ChangeSets:
commit 72e3148a6e987974e3e949c5668e5ca812d7c818
tree abdf33dbbe33029ab81e7a209f11f29d2bc6b801
parent c2731509cfb538b9b38feaf657fab2334ea45253
author Dave Kleikamp <shaggy@austin.ibm.com> Fri, 03 Jun 2005 14:09:54 -0500
committer Dave Kleikamp <shaggy@austin.ibm.com> Fri, 03 Jun 2005 14:09:54 -0500
JFS: Fix compiler warning in jfs_logmgr.c
fs/jfs/jfs_logmgr.c: In function `jfs_flush_journal':
fs/jfs/jfs_logmgr.c:1632: warning: unused variable `mp'
Some debug code in jfs_flush_journal does nothing when CONFIG_JFS_DEBUG
is not defined. Place the whole code segment within an ifdef to avoid
unnecessary code to be compiled and the warning to be issued.
Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
commit c2731509cfb538b9b38feaf657fab2334ea45253
tree cb7ad2847067b5ba436b78077c4abc61ce736444
parent 7078253c085c037c070ca4e8bc9e9e7f18aa1e84
author Dave Kleikamp <shaggy@austin.ibm.com> Thu, 02 Jun 2005 12:18:20 -0500
committer Dave Kleikamp <shaggy@austin.ibm.com> Thu, 02 Jun 2005 12:18:20 -0500
JFS: kernel BUG at fs/jfs/jfs_txnmgr.c:859
add_missing_indices() must set tlck->type to tlckBTROOT when modifying
a root btree root to avoid a trap in txRelease()
Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
commit 259692bd5a2b2c2d351dd90748ba4126bc2a21b9
tree fa35d57768a76bbd88fa54b33daf922e9415f9da
parent 6f817abc643ec84cf07c99f964d04976212e1fd3
author Jesper Juhl <juhl-lkml@dif.dk> Mon, 09 May 2005 10:47:14 -0500
committer Dave Kleikamp <shaggy@austin.ibm.com> Mon, 09 May 2005 10:47:14 -0500
JFS: Remove redundant kfree() NULL pointer checks
kfree() can handle a NULL pointer, don't worry about passing it one.
Signed-off-by: Jesper Juhl <juhl-lkml@dif.dk>
Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
commit 7a694ca74958b97ae2d437c8a730bddd9e9792c3
tree 1d25feb1d02cdff8affee0cbbcfc70b3af2c7385
parent dcc9871270aa3b1bbe2e61cc9c1d80e9b2e8099d
author Dave Kleikamp <shaggy@austin.ibm.com> Wed, 04 May 2005 15:31:14 -0500
committer Dave Kleikamp <shaggy@austin.ibm.com> Wed, 04 May 2005 15:31:14 -0500
JFS: Fix sparse warning
Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
commit dcc9871270aa3b1bbe2e61cc9c1d80e9b2e8099d
tree a6f64721b55739fcac62ba251563e6809b985a7d
parent 1868f4aa5a4a72bbe0b7db6c1d4ee666824c3895
author Dave Kleikamp <shaggy@austin.ibm.com> Wed, 04 May 2005 15:30:51 -0500
committer Dave Kleikamp <shaggy@austin.ibm.com> Wed, 04 May 2005 15:30:51 -0500
JFS: cleanup - remove unneeded sanity check
Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
commit 1868f4aa5a4a72bbe0b7db6c1d4ee666824c3895
tree c3bfa2751dcc1d7adf16a6a96e5ad8cab76b6f76
parent 6b6bf51081a27e80334e7ebe2993ae1d046a3222
author Dave Kleikamp <shaggy@austin.ibm.com> Wed, 04 May 2005 15:29:35 -0500
committer Dave Kleikamp <shaggy@austin.ibm.com> Wed, 04 May 2005 15:29:35 -0500
JFS: fix sparse warnings by moving extern declarations to headers
Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
^ permalink raw reply [flat|nested] 48+ messages in thread
* Re: [git pull] jfs update
2005-05-05 19:39 ` Andrew Morton
@ 2005-05-06 19:13 ` Dave Kleikamp
0 siblings, 0 replies; 48+ messages in thread
From: Dave Kleikamp @ 2005-05-06 19:13 UTC (permalink / raw)
To: Andrew Morton; +Cc: Linus Torvalds, jgarzik, linux-kernel
On Thu, 2005-05-05 at 12:39 -0700, Andrew Morton wrote:
> Dave Kleikamp <shaggy@austin.ibm.com> wrote:
> >
> > Andrew,
> > You can pull:
> >
> > rsync://rsync.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6.git/HEAD-for-mm
> >
> > whenever you do an -mm build. If your scripts have a problem with that,
> > you might try
> >
> > rsync://rsync.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6.git#for-mm
>
> Neither of those work for me, which I guess means that I have to go and
> update all my git stuff, whcih will break every darn thing. Ho hum.
If you haven't already, don't rush on my account. I don't need to put
anything in that tree newer than what I want in -mm, so you can use:
rsync://rsync.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6.git
In other words, I don't have any problem leaving HEAD equal to
HEAD-for-mm.
--
David Kleikamp
IBM Linux Technology Center
^ permalink raw reply [flat|nested] 48+ messages in thread
* Re: [git pull] jfs update
2005-05-05 18:51 ` Dave Kleikamp
@ 2005-05-05 19:39 ` Andrew Morton
2005-05-06 19:13 ` Dave Kleikamp
0 siblings, 1 reply; 48+ messages in thread
From: Andrew Morton @ 2005-05-05 19:39 UTC (permalink / raw)
To: Dave Kleikamp; +Cc: torvalds, jgarzik, linux-kernel
Dave Kleikamp <shaggy@austin.ibm.com> wrote:
>
> Andrew,
> You can pull:
>
> rsync://rsync.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6.git/HEAD-for-mm
>
> whenever you do an -mm build. If your scripts have a problem with that,
> you might try
>
> rsync://rsync.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6.git#for-mm
Neither of those work for me, which I guess means that I have to go and
update all my git stuff, whcih will break every darn thing. Ho hum.
^ permalink raw reply [flat|nested] 48+ messages in thread
* Re: [git pull] jfs update
2005-05-05 18:22 ` Linus Torvalds
@ 2005-05-05 18:51 ` Dave Kleikamp
2005-05-05 19:39 ` Andrew Morton
0 siblings, 1 reply; 48+ messages in thread
From: Dave Kleikamp @ 2005-05-05 18:51 UTC (permalink / raw)
To: Andrew Morton; +Cc: Linus Torvalds, Jeff Garzik, Andrew Morton, linux-kernel
On Thu, 2005-05-05 at 11:22 -0700, Linus Torvalds wrote:
>
> On Thu, 5 May 2005, Jeff Garzik wrote:
> >
> > FWIW I'm definitely interested in some sort of pull mechanism where I
> > can say "pull from foo://.../libata-2.6.git/HEAD-for-linus" also.
>
> I already changed my scripts to be able to do that. They default to HEAD,
> but if you tell them something else, they'll get that instead.
>
> So I'd do a
>
> git-pull-script foo://.../libata-2.6.git/ HEAD-for-linus
>
> except right now my pull script only works with rsync or ssh, not http.
> I'll fix that up asap.
>
> Linus
Andrew,
You can pull:
rsync://rsync.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6.git/HEAD-for-mm
whenever you do an -mm build. If your scripts have a problem with that,
you might try
rsync://rsync.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6.git#for-mm
Let me know which you prefer.
Thanks,
Shaggy
--
David Kleikamp
IBM Linux Technology Center
^ permalink raw reply [flat|nested] 48+ messages in thread
* Re: [git pull] jfs update
2005-05-05 18:16 ` Jeff Garzik
@ 2005-05-05 18:22 ` Linus Torvalds
2005-05-05 18:51 ` Dave Kleikamp
0 siblings, 1 reply; 48+ messages in thread
From: Linus Torvalds @ 2005-05-05 18:22 UTC (permalink / raw)
To: Jeff Garzik; +Cc: Dave Kleikamp, akpm, linux-kernel
On Thu, 5 May 2005, Jeff Garzik wrote:
>
> FWIW I'm definitely interested in some sort of pull mechanism where I
> can say "pull from foo://.../libata-2.6.git/HEAD-for-linus" also.
I already changed my scripts to be able to do that. They default to HEAD,
but if you tell them something else, they'll get that instead.
So I'd do a
git-pull-script foo://.../libata-2.6.git/ HEAD-for-linus
except right now my pull script only works with rsync or ssh, not http.
I'll fix that up asap.
Linus
^ permalink raw reply [flat|nested] 48+ messages in thread
* Re: [git pull] jfs update
2005-05-04 21:37 ` Linus Torvalds
2005-05-04 22:05 ` Dave Kleikamp
@ 2005-05-05 18:16 ` Jeff Garzik
2005-05-05 18:22 ` Linus Torvalds
1 sibling, 1 reply; 48+ messages in thread
From: Jeff Garzik @ 2005-05-05 18:16 UTC (permalink / raw)
To: Linus Torvalds; +Cc: Dave Kleikamp, akpm, linux-kernel
Linus Torvalds wrote:
>
> On Wed, 4 May 2005, Dave Kleikamp wrote:
>
>>I think I've got this set up right. I have created a HEAD-for-linus and
>>HEAD-for-mm in the same git repo.
>
>
> Ok, my scripts don't handle that very well yet (they just want HEAD), but
> that was easy enough to hack around. I'll be able to work with that
> format.
>
>
>>Please pull from
>>
>>rsync://rsync.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6.git/HEAD-for-linus
FWIW I'm definitely interested in some sort of pull mechanism where I
can say "pull from foo://.../libata-2.6.git/HEAD-for-linus" also.
With my netdev-2.6 queue, and given git's intrinsic abilities, I am
planning to keep all ~30 or so mini-branches in a single git tree. When
I am ready to push some upstream, I can do a HEAD-for-linus merge tree,
that merges selected branches.
Jeff
^ permalink raw reply [flat|nested] 48+ messages in thread
* Re: [git pull] jfs update
2005-05-04 21:37 ` Linus Torvalds
@ 2005-05-04 22:05 ` Dave Kleikamp
2005-05-05 18:16 ` Jeff Garzik
1 sibling, 0 replies; 48+ messages in thread
From: Dave Kleikamp @ 2005-05-04 22:05 UTC (permalink / raw)
To: Linus Torvalds; +Cc: Andrew Morton, Git Mailing List
cc'ing the git mailing list, dropping linux-kernel
On Wed, 2005-05-04 at 14:37 -0700, Linus Torvalds wrote:
>
> On Wed, 4 May 2005, Dave Kleikamp wrote:
> >
> > I think I've got this set up right. I have created a HEAD-for-linus and
> > HEAD-for-mm in the same git repo.
>
> Ok, my scripts don't handle that very well yet (they just want HEAD), but
> that was easy enough to hack around. I'll be able to work with that
> format.
After looking at the documentation and playing around, I'm wondering if
I should instead have created jfs-2.6.git/refs/heads/for-linus. Then
the url would be:
rsync://rsync.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6.git#for-linus
I think this currently works. Which would be the preferred format?
>
> > Please pull from
> >
> > rsync://rsync.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6.git/HEAD-for-linus
>
> Pulled, and pushed out.
>
> Linus
--
David Kleikamp
IBM Linux Technology Center
^ permalink raw reply [flat|nested] 48+ messages in thread
* Re: [git pull] jfs update
2005-05-04 20:47 Dave Kleikamp
@ 2005-05-04 21:37 ` Linus Torvalds
2005-05-04 22:05 ` Dave Kleikamp
2005-05-05 18:16 ` Jeff Garzik
0 siblings, 2 replies; 48+ messages in thread
From: Linus Torvalds @ 2005-05-04 21:37 UTC (permalink / raw)
To: Dave Kleikamp; +Cc: akpm, linux-kernel
On Wed, 4 May 2005, Dave Kleikamp wrote:
>
> I think I've got this set up right. I have created a HEAD-for-linus and
> HEAD-for-mm in the same git repo.
Ok, my scripts don't handle that very well yet (they just want HEAD), but
that was easy enough to hack around. I'll be able to work with that
format.
> Please pull from
>
> rsync://rsync.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6.git/HEAD-for-linus
Pulled, and pushed out.
Linus
^ permalink raw reply [flat|nested] 48+ messages in thread
* [git pull] jfs update
@ 2005-05-04 20:47 Dave Kleikamp
2005-05-04 21:37 ` Linus Torvalds
0 siblings, 1 reply; 48+ messages in thread
From: Dave Kleikamp @ 2005-05-04 20:47 UTC (permalink / raw)
To: torvalds; +Cc: akpm, linux-kernel
Linus,
I think I've got this set up right. I have created a HEAD-for-linus and
HEAD-for-mm in the same git repo.
I've got one patch that I'd like in 2.6.12, and I've got some cleanups
that can just stay in -mm for now.
Please pull from
rsync://rsync.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6.git/HEAD-for-linus
This will update the following files:
fs/jfs/jfs_xtree.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
through these ChangeSets:
commit 6b6bf51081a27e80334e7ebe2993ae1d046a3222
tree 30c44cf22caf3bbe090f333460711f7719e848af
parent 8800cea62025a5209d110c5fa5990429239d6eee
author Dave Kleikamp <shaggy@austin.ibm.com> Wed, 04 May 2005 09:11:49 -0500
committer Dave Kleikamp <shaggy@austin.ibm.com> Wed, 04 May 2005 09:11:49 -0500
JFS: Endian errors
Thanks sparse!
Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
^ permalink raw reply [flat|nested] 48+ messages in thread
end of thread, other threads:[~2011-07-27 14:55 UTC | newest]
Thread overview: 48+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2009-07-23 18:27 [GIT PULL] jfs update shaggy
-- strict thread matches above, loose matches on Subject: below --
2011-07-27 14:55 Dave Kleikamp
2010-04-21 12:42 shaggy
2009-06-16 19:14 shaggy
2009-06-11 16:58 shaggy
2009-03-25 12:43 [git pull] " shaggy
2008-12-29 16:01 shaggy
2008-07-14 16:48 shaggy
2008-04-17 18:36 shaggy
2008-02-07 21:02 shaggy
2008-01-25 19:27 shaggy
2007-10-10 13:35 shaggy
2007-07-09 19:34 Dave Kleikamp
2007-05-08 14:51 Dave Kleikamp
2007-04-28 13:20 Dave Kleikamp
2007-02-14 23:08 Dave Kleikamp
2007-02-07 13:35 Dave Kleikamp
2006-12-12 15:16 Dave Kleikamp
2006-11-04 3:07 Dave Kleikamp
2006-11-02 14:23 Dave Kleikamp
2006-10-23 12:53 Dave Kleikamp
2006-10-02 15:16 Dave Kleikamp
2006-10-02 15:31 ` Linus Torvalds
2006-10-02 15:41 ` Dave Kleikamp
2006-10-02 16:21 ` Al Viro
2006-09-25 13:04 Dave Kleikamp
2006-08-03 14:37 Dave Kleikamp
2006-07-14 1:45 Dave Kleikamp
2006-07-06 14:20 Dave Kleikamp
2006-05-24 13:10 Dave Kleikamp
2006-03-20 14:57 Dave Kleikamp
2006-03-14 18:47 Dave Kleikamp
2006-03-14 19:33 ` Linus Torvalds
2005-11-09 21:40 Dave Kleikamp
2005-10-28 19:12 Dave Kleikamp
2005-08-04 21:07 Dave Kleikamp
2005-07-27 18:05 Dave Kleikamp
2005-07-27 23:43 ` Linus Torvalds
2005-07-13 14:41 Dave Kleikamp
2005-06-20 16:18 Dave Kleikamp
2005-05-04 20:47 Dave Kleikamp
2005-05-04 21:37 ` Linus Torvalds
2005-05-04 22:05 ` Dave Kleikamp
2005-05-05 18:16 ` Jeff Garzik
2005-05-05 18:22 ` Linus Torvalds
2005-05-05 18:51 ` Dave Kleikamp
2005-05-05 19:39 ` Andrew Morton
2005-05-06 19:13 ` Dave Kleikamp
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.