[GIT PULL] ext4 update

[GIT PULL] ext4 update

[Theodore Ts'o]

Hi Linus,

Please pull from:

        git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git for_linus

It has a number random cleanups and bug fixes, and two new features.
The first is uninitialized block groups, which allows fast mke2fs
operations plus as well as speeding up e2fsck by allowing it to skip
parts of the inode tables that haven't been used yet.  A checksum has
been added to block group descriptors so we can tell detect corruption
in that data structure, since we are depending on it being accurate so
we know what portion of the inode table is really in use.

The second feature is flexible block groups, which allows inode tables
and block/inode bitmaps to be grouped together outside of the block
group that they administer, to allow contiguous regions of data blocks
to span multiple block groups, which helps for large files significantly
bigger than the size of a block group (i.e., 32 gigabytes on a 4k block
filesystem).

All of these patches have been baking in -mm for a while.

Regards,

							- Ted

Andreas Dilger (1):
      Ext4: Uninitialized Block Groups

Aneesh Kumar K.V (8):
      ext4: Fix sparse warnings
      ext4: Convert bg_block_bitmap to bg_block_bitmap_lo
      ext4: Convert bg_inode_bitmap and bg_inode_table
      ext4: Convert s_blocks_count to s_blocks_count_lo
      ext4: Convert s_r_blocks_count and s_free_blocks_count
      ext4: Convert ext4_extent.ee_start to ext4_extent.ee_start_lo
      ext4: Convert ext4_extent_idx.ei_leaf to ext4_extent_idx.ei_leaf_lo
      ext4: sparse fixes

Coly Li (1):
      ext4: Remove (partial, never completed) fragment support

Eric Sandeen (3):
      ext4: remove #ifdef CONFIG_EXT4_INDEX
      ext4: fix setup_new_group_blocks locking
      ext4: lighten up resize transaction requirements

Jan Kara (1):
      jbd2: fix commit code to properly abort journal

Jose R. Santos (2):
      JBD2: debug code cleanup.
      ext4: FLEX_BG Kernel support v2.

Mingming Cao (6):
      JBD: JBD slab allocation cleanups
      JBD2: jbd2 slab allocation cleanups
      JBD: replace jbd_kmalloc with kmalloc directly
      JBD2: replace jbd_kmalloc with kmalloc directly.
      JBD2/Ext4: Convert kmalloc to kzalloc in jbd2/ext4
      jbd2: JBD_XXX to JBD2_XXX naming cleanup

 fs/Kconfig                      |    1 +
 fs/ext4/balloc.c                |  112 ++++++++++++++++++++++++++++-
 fs/ext4/dir.c                   |    7 --
 fs/ext4/extents.c               |   14 ++--
 fs/ext4/fsync.c                 |    2 +-
 fs/ext4/group.h                 |   27 +++++++
 fs/ext4/ialloc.c                |  151 +++++++++++++++++++++++++++++++++++----
 fs/ext4/inode.c                 |   18 ++----
 fs/ext4/namei.c                 |   20 -----
 fs/ext4/resize.c                |   59 +++++++++++-----
 fs/ext4/super.c                 |   97 +++++++++++++++++--------
 fs/ext4/xattr.c                 |    7 +-
 fs/jbd/commit.c                 |    6 +-
 fs/jbd/journal.c                |   99 ++------------------------
 fs/jbd/transaction.c            |   12 ++--
 fs/jbd2/commit.c                |   16 ++--
 fs/jbd2/journal.c               |  128 ++++-----------------------------
 fs/jbd2/recovery.c              |    2 +-
 fs/jbd2/revoke.c                |    4 +-
 fs/jbd2/transaction.c           |   19 +++---
 include/linux/ext4_fs.h         |  103 ++++++++++----------------
 include/linux/ext4_fs_extents.h |    4 +-
 include/linux/ext4_fs_i.h       |    5 --
 include/linux/ext4_fs_sb.h      |    3 -
 include/linux/ext4_jbd2.h       |    6 +-
 include/linux/jbd.h             |   17 +++--
 include/linux/jbd2.h            |   49 +++++++------
 include/linux/poison.h          |    3 +-
 28 files changed, 527 insertions(+), 464 deletions(-)
 create mode 100644 fs/ext4/group.h

Re: [GIT PULL] ext4 update

[david]

On Wed, 17 Oct 2007, Theodore Ts'o wrote:

> Hi Linus,
>
> Please pull from:
>
>        git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git for_linus
>
> It has a number random cleanups and bug fixes, and two new features.
> The first is uninitialized block groups, which allows fast mke2fs
> operations plus as well as speeding up e2fsck by allowing it to skip
> parts of the inode tables that haven't been used yet.

nice feature, is there any work on a tool to go through a well-used 
filesystem and mark unused block groups as uninitialized? (I would guess 
that such a tool may want to move files to make this so)

David Lang

>   A checksum has
> been added to block group descriptors so we can tell detect corruption
> in that data structure, since we are depending on it being accurate so
> we know what portion of the inode table is really in use.
>
> The second feature is flexible block groups, which allows inode tables
> and block/inode bitmaps to be grouped together outside of the block
> group that they administer, to allow contiguous regions of data blocks
> to span multiple block groups, which helps for large files significantly
> bigger than the size of a block group (i.e., 32 gigabytes on a 4k block
> filesystem).
>
> All of these patches have been baking in -mm for a while.
>
> Regards,
>
> 							- Ted
>
> Andreas Dilger (1):
>      Ext4: Uninitialized Block Groups
>
> Aneesh Kumar K.V (8):
>      ext4: Fix sparse warnings
>      ext4: Convert bg_block_bitmap to bg_block_bitmap_lo
>      ext4: Convert bg_inode_bitmap and bg_inode_table
>      ext4: Convert s_blocks_count to s_blocks_count_lo
>      ext4: Convert s_r_blocks_count and s_free_blocks_count
>      ext4: Convert ext4_extent.ee_start to ext4_extent.ee_start_lo
>      ext4: Convert ext4_extent_idx.ei_leaf to ext4_extent_idx.ei_leaf_lo
>      ext4: sparse fixes
>
> Coly Li (1):
>      ext4: Remove (partial, never completed) fragment support
>
> Eric Sandeen (3):
>      ext4: remove #ifdef CONFIG_EXT4_INDEX
>      ext4: fix setup_new_group_blocks locking
>      ext4: lighten up resize transaction requirements
>
> Jan Kara (1):
>      jbd2: fix commit code to properly abort journal
>
> Jose R. Santos (2):
>      JBD2: debug code cleanup.
>      ext4: FLEX_BG Kernel support v2.
>
> Mingming Cao (6):
>      JBD: JBD slab allocation cleanups
>      JBD2: jbd2 slab allocation cleanups
>      JBD: replace jbd_kmalloc with kmalloc directly
>      JBD2: replace jbd_kmalloc with kmalloc directly.
>      JBD2/Ext4: Convert kmalloc to kzalloc in jbd2/ext4
>      jbd2: JBD_XXX to JBD2_XXX naming cleanup
>
> fs/Kconfig                      |    1 +
> fs/ext4/balloc.c                |  112 ++++++++++++++++++++++++++++-
> fs/ext4/dir.c                   |    7 --
> fs/ext4/extents.c               |   14 ++--
> fs/ext4/fsync.c                 |    2 +-
> fs/ext4/group.h                 |   27 +++++++
> fs/ext4/ialloc.c                |  151 +++++++++++++++++++++++++++++++++++----
> fs/ext4/inode.c                 |   18 ++----
> fs/ext4/namei.c                 |   20 -----
> fs/ext4/resize.c                |   59 +++++++++++-----
> fs/ext4/super.c                 |   97 +++++++++++++++++--------
> fs/ext4/xattr.c                 |    7 +-
> fs/jbd/commit.c                 |    6 +-
> fs/jbd/journal.c                |   99 ++------------------------
> fs/jbd/transaction.c            |   12 ++--
> fs/jbd2/commit.c                |   16 ++--
> fs/jbd2/journal.c               |  128 ++++-----------------------------
> fs/jbd2/recovery.c              |    2 +-
> fs/jbd2/revoke.c                |    4 +-
> fs/jbd2/transaction.c           |   19 +++---
> include/linux/ext4_fs.h         |  103 ++++++++++----------------
> include/linux/ext4_fs_extents.h |    4 +-
> include/linux/ext4_fs_i.h       |    5 --
> include/linux/ext4_fs_sb.h      |    3 -
> include/linux/ext4_jbd2.h       |    6 +-
> include/linux/jbd.h             |   17 +++--
> include/linux/jbd2.h            |   49 +++++++------
> include/linux/poison.h          |    3 +-
> 28 files changed, 527 insertions(+), 464 deletions(-)
> create mode 100644 fs/ext4/group.h
> -
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at  http://www.tux.org/lkml/
>

Re: [GIT PULL] ext4 update

[Linus Torvalds]

On Wed, 17 Oct 2007, Theodore Ts'o wrote:
> 
> Please pull from:
> 
>         git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git for_linus

This conflicts in nontrivial ways with

	commit 7c9e69faa28027913ee059c285a5ea8382e24b5d
	Author: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
	Date:   Tue Oct 16 23:27:02 2007 -0700

	    ext2/ext3/ext4: add block bitmap validation

which I just merged from -mm.

I suspect it's trivial to fix up for somebody who knows/understands the 
code, but I'm not that person, and I cannot verify the end result.

So can you please do the merge, and I'll pull the merged tree?

		Linus

Re: [GIT PULL] ext4 update

[Theodore Tso]

On Wed, Oct 17, 2007 at 08:59:53AM -0700, Linus Torvalds wrote:
> > Please pull from:
> > 
> >         git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git for_linus
> 
> This conflicts in nontrivial ways with
> 
> which I just merged from -mm.
> 
> I suspect it's trivial to fix up for somebody who knows/understands the 
> code, but I'm not that person, and I cannot verify the end result.
> 
> So can you please do the merge, and I'll pull the merged tree?
> 

OK, I've rebased and fixed up the patches with your latest git tree.

Could you please pull from:

	git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git for_linus

now?   Thanks!!

						- Ted

Re: [GIT PULL] ext4 update

[Andreas Dilger]

On Oct 16, 2007  21:51 -0700, david@lang.hm wrote:
> On Wed, 17 Oct 2007, Theodore Ts'o wrote:
> >It has a number random cleanups and bug fixes, and two new features.
> >The first is uninitialized block groups, which allows fast mke2fs
> >operations plus as well as speeding up e2fsck by allowing it to skip
> >parts of the inode tables that haven't been used yet.
> 
> nice feature, is there any work on a tool to go through a well-used 
> filesystem and mark unused block groups as uninitialized? (I would guess 
> that such a tool may want to move files to make this so)

Yes, just set the feature flag via tune2fs and then run e2fsck on it.
The second e2fsck shown below is just a demonstration of the speedup.

    # tune2fs -O uninit_groups /dev/foo
    tune2fs 1.39.cfs9 (7-Apr-2007)

    Please run e2fsck on the filesystem.

    # time e2fsck -fy /dev/foo
    e2fsck 1.39.cfs9 (7-Apr-2007)
    Group descriptor 0 checksum is invalid.  Fix? yes

    {repeats for all groups}

    Pass 1: Checking inodes, blocks, and sizes
    Pass 2: Checking directory structure
    Pass 3: Checking directory connectivity
    Pass 4: Checking reference counts
    Pass 5: Checking group summary information
    lustre-OST0000: 9099/1640160 files (0.4% non-contiguous), 221996/6554520
    blocks

    real    0m17.273s
    user    0m4.930s
    sys     0m1.749s

    # time e2fsck -fy /dev/hda3
    e2fsck 1.39.cfs9 (7-Apr-2007)
    Pass 1: Checking inodes, blocks, and sizes
    Pass 2: Checking directory structure
    Pass 3: Checking directory connectivity
    Pass 4: Checking reference counts
    Pass 5: Checking group summary information
    lustre-OST0000: 9099/1640160 files (0.4% non-contiguous), 221996/6554520
    blocks

    real    0m2.412s
    user    0m0.604s
    sys     0m0.077s


The caveats are:
(a) this is a read-only feature, so you can't mount such a filesystem r/w
    on an older kernel.  You can disable it with "tune2fs -O ^uninit_groups"
    and run a full e2fsck on it again.
(b) I don't think there is an official e2fsprogs release with support for this
    feature yet (it's in the pipe, however).
(c) The actual speedup depends on how full the filesystem is, but since ext*
    usually has way too many inodes, it is generally pretty good.

Cheers, Andreas
--
Andreas Dilger
Principal Software Engineer
Cluster File Systems, Inc.

Re: [GIT PULL] ext4 update

[Andrew Morton]

On Wed, 17 Oct 2007 08:59:53 -0700 (PDT)
Linus Torvalds <torvalds@linux-foundation.org> wrote:

> On Wed, 17 Oct 2007, Theodore Ts'o wrote:
> > 
> > Please pull from:
> > 
> >         git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git for_linus
> 
> This conflicts in nontrivial ways with
> 
> 	commit 7c9e69faa28027913ee059c285a5ea8382e24b5d
> 	Author: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
> 	Date:   Tue Oct 16 23:27:02 2007 -0700
> 
> 	    ext2/ext3/ext4: add block bitmap validation
> 
> which I just merged from -mm.

<catching up>

There shouldn't have been conflicts here - if there were I wouldn't have
sent those patches.  Unless there were things in the ext4 pull which
weren't present in the ext4 quilt tree which I included in 2.6.23-mm1?

Re: [GIT PULL] ext4 update

[Linus Torvalds]

On Thu, 25 Oct 2007, Andrew Morton wrote:
> 
> There shouldn't have been conflicts here - if there were I wouldn't have
> sent those patches.  Unless there were things in the ext4 pull which
> weren't present in the ext4 quilt tree which I included in 2.6.23-mm1?

Well, you merge your patch-series by patching.

You should have noticed by now that GNU patch in particular will happily 
apply a patch whether it conflicts or not. So it's entirely possible that 
it didn't conflict for you, but applied cleanly and sanely.

		Linus

Re: [GIT PULL] ext4 update

[Andrew Morton]

On Thu, 25 Oct 2007 16:44:21 -0700 (PDT)
Linus Torvalds <torvalds@linux-foundation.org> wrote:

> 
> 
> On Thu, 25 Oct 2007, Andrew Morton wrote:
> > 
> > There shouldn't have been conflicts here - if there were I wouldn't have
> > sent those patches.  Unless there were things in the ext4 pull which
> > weren't present in the ext4 quilt tree which I included in 2.6.23-mm1?
> 
> Well, you merge your patch-series by patching.
> 
> You should have noticed by now that GNU patch in particular will happily 
> apply a patch whether it conflicts or not. So it's entirely possible that 
> it didn't conflict for you, but applied cleanly and sanely.
> 

hrm, could be.  It would be strange for that to happen quietly with fuzz=1
and to still produce a compileable result.

But there weren't any patches in this git-merge which weren't in 2.6.23-mm1
so maybe something like that happened.  Or maybe that fact that this pull
only contained _some_ of the ext4 patches which were in -mm somehow affected
things.

Oh well, I should have sent the ext4 changes via Ted anyway.

[GIT PULL] ext4 update

[Theodore Ts'o]

Hi Linus,

Please pull from:

        git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git for_linus

These are all cleanups and bug fixes for 2.6.26.

Thanks,

						- Ted

Akinobu Mita (3):
      ext4: use ext4_group_first_block_no()
      ext4: use ext4_get_group_desc()
      ext4: check ext4_journal_get_write_access() errors

Andi Kleen (1):
      Convert ext4 to use unlocked_ioctl

Aneesh Kumar K.V (15):
      ext4: Fix fallocate error path
      ext4: Enable extent format for symlinks.
      arm: Export empty_zero_page for ZERO_PAGE usage in modules.
      m68k: Export empty_zero_page for ZERO_PAGE usage in modules.
      sparc: Export symbols for ZERO_PAGE usage in modules.
      ext4: ENOSPC error handling for writing to an uninitialized extent
      ext4: zero out small extents when writing to prealloc area.
      ext4: Fix race between migration and mmap write
      ext4: Fix fallocate to update the file size in each transaction
      ext4: make ext4_ext_get_blocks always return <= max_blocks
      ext4: Return unwritten buffer head when trying to read from prealloc space.
      ext4: Cache the correct extent length for uninit extents
      ext4:  Convert list_for_each_rcu() to list_for_each_entry_rcu()
      ext4: Don't do GFP_NOFS allocations after taking ext4_lock_group
      ext4: mark inode dirty after initializing the extent tree

Christoph Hellwig (1):
      ext4: move headers out of include/linux

Duane Griffin (4):
      jbd2: tidy up revoke cache initialisation and destruction
      jbd2: eliminate duplicated code in revocation table init/destroy functions
      jbd2: replace potentially false assertion with if block
      jbd2: only create debugfs and stats entries if init is successful

Eric Sandeen (1):
      ext4: reduce mballoc stack usage with noinline_for_stack

Harvey Harrison (2):
      ext4: replace remaining __FUNCTION__ occurrences
      jdb2: replace remaining __FUNCTION__ occurrences

Hisashi Hifumi (1):
      ext4: fdatasync should skip metadata writeout when overwriting

Jan Kara (2):
      ext4: Fix update of mtime and ctime on rename
      ext4: Fix hang on umount with quotas when journal is aborted

Joe Perches (1):
      ext4: remove duplicate include of ext4_fs_i.h header file

Josef Bacik (6):
      jbd2: fix the way the b_modified flag is cleared
      jbd2: fix possible journal overflow issues
      ext4:  check return of ext4_orphan_get properly
      ext4: fix mount option parsing
      ext4: fix wrong gfp type under transaction
      ext4: don't use ext4_error in ext4_check_descriptors

Marcin Slusarz (2):
      ext4: le*_add_cpu conversion
      ext4: convert byte order of constant instead of variable

Mingming Cao (3):
      ext4: remove extra define of ext4_new_blocks_old from mballoc.c
      ext4: make ext4_xattr_list() static
      ext4: Move mballoc headers/structures to a seperate header file mballoc.h

Randy Dunlap (1):
      jbd2: fix kernel-doc notation

Roel Kluin (3):
      ext3: fix test ext_generic_write_end() copied return value
      ext4: fix test ext_generic_write_end() copied return value
      ext4: fix hot spins in mballoc after err_freebuddy and err_freemeta

Solofo Ramangalahy (2):
      ext4: update ctime and mtime for truncate with extents.
      ext4: cleanup for compiling mballoc with verification and debugging #defines

[GIT PULL] ext4 update

[Theodore Ts'o]

Hi Linus,

Please pull from:

        git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git for_linus

To get a number of ext4 bug fixes for 2.6.25.

Thanks,

                                                - Ted

Akinobu Mita (1):
      ext4: add missing ext4_journal_stop()

Andi Kleen (1):
      Remove incorrect BKL comments in ext4

Aneesh Kumar K.V (8):
      ext4: Fix locking hierarchy violation in ext4_fallocate()
      ext4: Don't leave behind a half-created inode if ext4_mkdir() fails
      ext4: Fix memory and buffer head leak in callers to ext4_ext_find_extent()
      ext4: Get journal write access before modifying the extent tree
      ext4: Don't claim block from group which has corrupt bitmap
      ext4: Don't mark filesystem error if fallocate fails
      ext4: set EXT4_EXTENTS_FL only for directory and regular files
      ext4: ext4_find_next_zero_bit needs an aligned address on some arch

Mingming Cao (1):
      ext4: Fix BUG when writing to an unitialized extent

Theodore Ts'o (1):
      ext4: Don't use ext4_dec_count() if not needed

Valerie Clement (2):
      ext4: Fix kernel BUG at fs/ext4/mballoc.c:910!
      ext4: modify block allocation algorithm for the last group

 fs/ext4/dir.c                   |    2 +-
 fs/ext4/extents.c               |   59 +++++++++++++++++++---------
 fs/ext4/ialloc.c                |   22 +++++++---
 fs/ext4/inode.c                 |   56 +++++++++++++++++++++++++--
 fs/ext4/mballoc.c               |   80 +++++++++++++++++++++++++++------------
 fs/ext4/migrate.c               |    5 ++
 fs/ext4/namei.c                 |   18 +++-----
 fs/ext4/resize.c                |    1 +
 include/linux/ext4_fs_extents.h |    1 +
 9 files changed, 177 insertions(+), 67 deletions(-)

[GIT PULL] ext4 update

[Theodore Ts'o]

Hi Linus,

Please pull from:

        git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git for_linus

These are mostly bug fixes that we've found since the last pull request.
The one non-bugfix change is that I've added a sanity check to assure
that production ext3 filesystems don't get mounted with ext4dev
accidentally.  The need for this was discovered when Eric Sandeen
started putting ext4 into Fedora's Rawhide release for initial testing.

Thanks,

						- Ted

Aneesh Kumar K.V (5):
      jbd2: Fix reference counting on the journal commit block's buffer head
      JBD2: Use the incompat macro for testing the incompat feature.
      ext4: Fix null bh pointer dereference in mballoc
      ext4: Fix circular locking dependency with migrate and rm.
      ext4: Don't panic in case of corrupt bitmap

Dave Kleikamp (1):
      JBD2:  Clear buffer_ordered flag for barried IO request on success

Eric Sandeen (2):
      allow in-inode EAs on ext4 root inode
      ext4: allocate struct ext4_allocation_context from a kmem cache

Jan Kara (2):
      jbd: Remove useless loop when writing commit record
      ext4: Fix Direct I/O locking

Mingming Cao (1):
      jbd2: Add error check to journal_wait_on_commit_record to avoid oops

Theodore Tso (1):
      ext4: Add new "development flag" to the ext4 filesystem

Valerie Clement (1):
      ext4: Don't set EXTENTS_FL flag for fast symlinks

 fs/ext4/inode.c         |  115 +++++++++++++++-----------------
 fs/ext4/mballoc.c       |  164 ++++++++++++++++++++++++++++++-----------------
 fs/ext4/migrate.c       |  123 +++++++++++++++++++++++------------
 fs/ext4/namei.c         |    1 +
 fs/ext4/super.c         |   11 +++
 fs/jbd/commit.c         |   14 ++--
 fs/jbd2/commit.c        |   10 ++-
 fs/jbd2/recovery.c      |    2 +-
 include/linux/ext4_fs.h |    7 ++
 9 files changed, 270 insertions(+), 177 deletions(-)

Re: [GIT PULL] ext4 update

[Linus Torvalds]

On Wed, 30 Jan 2008, Theodore Tso wrote:
> 
> That's because you are doing a diff stat of changes that haven't been
> checked in yet.  I was doing a "git log -p origin.. | diffstat -p1",
> and in that incantation you definitely do need the -p1 to diffstat.

You should *always* use "-p1" to diffstat, because if you don't, diffstat 
just makes up the paths totally (the same way you should always use "-p1" 
to GNU 'patch').

The fact is, diffstat just guesses, based on the prefix. But those guesses 
will be totally bogus at times, especially if you have newly created files 
(I _think_ that is because one of the pathnames in the diff is /dev/null, 
and that will apparently throw off the guesses).

So if you don't use an explicit "-p1", diffstat will guess the -p level 
from the longest common path prefix, _but_ get that wrong for some paths 
anyway, so sometimes you'll see the "a/" prefix etc.

Of course, rather than using diffstat at all, just do something like

	git diff --stat origin..

instead.

		Linus

Re: [GIT PULL] ext4 update

[Paul Collins]

Theodore Tso <tytso@MIT.EDU> writes:

> On Tue, Jan 29, 2008 at 10:54:03PM +0100, Jan Engelhardt wrote:
>> 
>> I am seeing normal behavior:
>>
>> 22:52 sovereign:~/linux > git diff HEAD | diffstat
>
> That's because you are doing a diff stat of changes that haven't been
> checked in yet.  I was doing a "git log -p origin.. | diffstat -p1",
> and in that incantation you definitely do need the -p1 to diffstat.

How about git diff --stat origin.. ?

-- 
Paul Collins
Wellington, New Zealand

Dag vijandelijk luchtschip de huismeester is dood

Re: [GIT PULL] ext4 update

[Theodore Tso]

On Tue, Jan 29, 2008 at 10:54:03PM +0100, Jan Engelhardt wrote:
> 
> On Jan 29 2008 07:53, Theodore Tso wrote:
> >
> >>fwiw, diffstat is confused by git's diff output; you need to use
> >>'diffstat -p1'
> 
> I am seeing normal behavior:
>
> 22:52 sovereign:~/linux > git diff HEAD | diffstat

That's because you are doing a diff stat of changes that haven't been
checked in yet.  I was doing a "git log -p origin.. | diffstat -p1",
and in that incantation you definitely do need the -p1 to diffstat.

       	    		    	       	  - Ted

Re: [GIT PULL] ext4 update

[Jan Engelhardt]

On Jan 29 2008 07:53, Theodore Tso wrote:
>
>>fwiw, diffstat is confused by git's diff output; you need to use
>>'diffstat -p1'

I am seeing normal behavior:

22:52 sovereign:~/linux > git status
# On branch dev-pcidata-dvb
# Changes to be committed:
#   (use "git reset HEAD <file>..." to unstage)
#
#       modified:   drivers/media/dvb/b2c2/flexcop-pci.c
#       modified:   drivers/media/dvb/ttpci/av7110.c
#       modified:   drivers/media/dvb/ttpci/budget-av.c
#       modified:   drivers/media/dvb/ttpci/budget-ci.c
#       modified:   drivers/media/dvb/ttpci/budget-patch.c
#       modified:   drivers/media/dvb/ttpci/budget.c
#       modified:   drivers/media/radio/radio-gemtek-pci.c
#       modified:   drivers/media/radio/radio-maestro.c
#       modified:   drivers/media/radio/radio-maxiradio.c
#       modified:   drivers/media/video/bt8xx/bttv-driver.c
#       modified:   drivers/media/video/cafe_ccic.c
#       modified:   drivers/media/video/cx23885/cx23885-core.c
#       modified:   drivers/media/video/cx88/cx88-mpeg.c
#       modified:   drivers/media/video/cx88/cx88-video.c
#       modified:   drivers/media/video/dpc7146.c
#       modified:   drivers/media/video/hexium_gemini.c
#       modified:   drivers/media/video/hexium_orion.c
#       modified:   drivers/media/video/meye.c
#       modified:   drivers/media/video/mxb.c
#       modified:   drivers/media/video/saa7134/saa7134-cards.c
#       modified:   drivers/media/video/stradis.c
#       modified:   drivers/media/video/zoran_card.c
#
22:52 sovereign:~/linux > git diff HEAD | diffstat
 dvb/b2c2/flexcop-pci.c        |    2 +-
 dvb/ttpci/av7110.c            |    4 ++--
 dvb/ttpci/budget-av.c         |    2 +-
 dvb/ttpci/budget-ci.c         |    4 ++--
 dvb/ttpci/budget-patch.c      |    2 +-
 dvb/ttpci/budget.c            |    2 +-
 radio/radio-gemtek-pci.c      |    3 +--
 radio/radio-maestro.c         |    2 +-
 radio/radio-maxiradio.c       |    2 +-
 video/bt8xx/bttv-driver.c     |    2 +-
 video/cafe_ccic.c             |    2 +-
 video/cx23885/cx23885-core.c  |    2 +-
 video/cx88/cx88-mpeg.c        |    2 +-
 video/cx88/cx88-video.c       |    2 +-
 video/dpc7146.c               |    4 ++--
 video/hexium_gemini.c         |    4 ++--
 video/hexium_orion.c          |    4 ++--
 video/meye.c                  |    2 +-
 video/mxb.c                   |    4 ++--
 video/saa7134/saa7134-cards.c |    2 +-
 video/stradis.c               |    2 +-
 video/zoran_card.c            |    2 +-
 22 files changed, 28 insertions(+), 29 deletions(-)

Re: [GIT PULL] ext4 update

[Theodore Tso]

>fwiw, diffstat is confused by git's diff output; you need to use
>'diffstat -p1'

Argh, I have *got* to create a script that does this automatically.

Revised diffstat -p1 output follows...

						- Ted

 Documentation/filesystems/ext4.txt           |   20 
 Documentation/filesystems/proc.txt           |   39 
 fs/Kconfig                                   |    1 
 fs/afs/dir.c                                 |    9 
 fs/afs/inode.c                               |    3 
 fs/buffer.c                                  |   44 
 fs/ext2/super.c                              |   32 
 fs/ext3/super.c                              |   32 
 fs/ext4/Makefile                             |    4 
 fs/ext4/balloc.c                             |  251 +
 fs/ext4/dir.c                                |   14 
 fs/ext4/extents.c                            |  525 +--
 fs/ext4/file.c                               |   23 
 fs/ext4/group.h                              |    8 
 fs/ext4/ialloc.c                             |  161 
 fs/ext4/inode.c                              |  396 +-
 fs/ext4/ioctl.c                              |    7 
 fs/ext4/mballoc.c                            | 4552 +++++++++++++++++++++++++++
 fs/ext4/migrate.c                            |  570 +++
 fs/ext4/namei.c                              |  135 
 fs/ext4/resize.c                             |   28 
 fs/ext4/super.c                              |  389 +-
 fs/ext4/xattr.c                              |    4 
 fs/inode.c                                   |   39 
 fs/jbd2/checkpoint.c                         |   22 
 fs/jbd2/commit.c                             |  255 +
 fs/jbd2/journal.c                            |  368 ++
 fs/jbd2/recovery.c                           |  151 
 fs/jbd2/revoke.c                             |    6 
 fs/jbd2/transaction.c                        |   34 
 fs/read_write.c                              |    1 
 include/asm-arm/bitops.h                     |    2 
 include/asm-generic/bitops/ext2-non-atomic.h |    2 
 include/asm-generic/bitops/le.h              |    4 
 include/asm-m68k/bitops.h                    |    2 
 include/asm-m68knommu/bitops.h               |    2 
 include/asm-powerpc/bitops.h                 |    4 
 include/asm-s390/bitops.h                    |    2 
 include/linux/buffer_head.h                  |    2 
 include/linux/ext4_fs.h                      |  224 +
 include/linux/ext4_fs_extents.h              |   25 
 include/linux/ext4_fs_i.h                    |   25 
 include/linux/ext4_fs_sb.h                   |   55 
 include/linux/fs.h                           |   21 
 include/linux/jbd2.h                         |  135 
 lib/find_next_bit.c                          |   43 
 46 files changed, 7773 insertions(+), 898 deletions(-)

[GIT PULL] ext4 update

[Theodore Ts'o]

Hi Linus,

Please pull from:

        git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git for_linus

This is the major set of updates meant for 2.6.24 from the ext4 team;
these patches have been baking in -mm for a while.  The two major
features included here is the multi-block allocator that has been in use
by Clusterfs for their luster filesystem, as well as the journal
checksumming features.  There were also a huge number of clean ups and
various bug fixes.

Regards,

						- Ted

Adrian Bunk (1):
      ext4/super.c: fix #ifdef's (CONFIG_EXT4_* -> CONFIG_EXT4DEV_*)

Alex Tomas (2):
      ext4: Add new functions for searching extent tree
      ext4: Add multi block allocator for ext4

Aneesh Kumar K.V (23):
      ext4: Introduce ext4_lblk_t
      ext4: Introduce ext4_update_*_feature
      ext4:  Fix sparse warnings.
      ext4: Rename i_file_acl to i_file_acl_lo
      ext4: Rename i_dir_acl to i_size_high
      ext4: Add support for 48 bit inode i_blocks.
      ext4: Support large files
      ext2: Fix the max file size for ext2 file system.
      ext3: Fix the max file size for ext3 file system.
      ext4: Return after ext4_error in case of failures
      ext4: Change the default behaviour on error
      Add buffer head related helper functions
      ext4: add block bitmap validation
      ext4: Check for the correct error return from
      ext4: Make ext4_get_blocks_wrap take the truncate_mutex early.
      ext4: Convert truncate_mutex to read write semaphore.
      ext4: Take read lock during overwrite case.
      ext4: Add EXT4_IOC_MIGRATE ioctl
      ext4: Fix ext4_show_options to show the correct mount options.
      ext4: Add ext4_find_next_bit()
      ext4: Enable the multiblock allocator by default
      ext4: Check for return value from sb_set_blocksize
      ext4: Use the ext4_ext_actual_len() helper function

Avantika Mathur (2):
      ext4: add ext4_group_t, and change all group variables to this type.
      ext4: fixes block group number being set to a negative value

Chris Snook (1):
      jbd2: Remove printk from J_ASSERT to preserve registers during BUG

Coly Li (1):
      ext4: sync up block group descriptor with e2fsprogs.

Dmitry Monakhov (1):
      ext4: fix uniniatilized extent splitting error

Eric Sandeen (6):
      ext4 extents: remove unneeded casts
      ext4: different maxbytes functions for bitmap & extent	files
      ext4: export iov_shorten from kernel for ext4's use
      ext4: store maxbytes for bitmapped  files and return EFBIG as appropriate
      ext4: fix oops on corrupted ext4 mount
      ext4: fix up EXT4FS_DEBUG builds

Girish Shilamkar (1):
      ext4: Add the journal checksum feature

Jan Kara (2):
      ext4: Avoid rec_len overflow with 64KB block size
      jbd2: Fix assertion failure in fs/jbd2/checkpoint.c

Jean Noel Cordenner (2):
      vfs: Add 64 bit i_version support
      ext4: Add inode version support in ext4

Johann Lombardi (1):
      jbd2: jbd2 stats through procfs

Mariusz Kozlowski (1):
      ext4: remove unused code from ext4_find_entry()

Miklos Szeredi (1):
      ext4: Add stripe= option to /proc/mounts

Mingming Cao (4):
      jbd2: add lockdep support
      jbd2: Mark jbd2 slabs as SLAB_TEMPORARY
      jbd2: Use round-jiffies() function for the "5 second" ext4/jbd2 wakeup
      jbd2: sparse pointer use of zero as null

Takashi Sato (1):
      ext4:  Support large blocksize up to PAGESIZE

 Documentation/filesystems/ext4.txt             |   10 
 b/Documentation/filesystems/ext4.txt           |   10 
 b/Documentation/filesystems/proc.txt           |   39 
 b/fs/Kconfig                                   |    1 
 b/fs/afs/dir.c                                 |    9 
 b/fs/afs/inode.c                               |    3 
 b/fs/buffer.c                                  |   44 
 b/fs/ext2/super.c                              |   32 
 b/fs/ext3/super.c                              |   32 
 b/fs/ext4/Makefile                             |    2 
 b/fs/ext4/balloc.c                             |   67 
 b/fs/ext4/dir.c                                |    2 
 b/fs/ext4/extents.c                            |   24 
 b/fs/ext4/file.c                               |    4 
 b/fs/ext4/group.h                              |    8 
 b/fs/ext4/ialloc.c                             |    2 
 b/fs/ext4/inode.c                              |   15 
 b/fs/ext4/ioctl.c                              |    3 
 b/fs/ext4/mballoc.c                            | 4552 +++++++++++++++++++++++++
 b/fs/ext4/migrate.c                            |  570 +++
 b/fs/ext4/namei.c                              |    4 
 b/fs/ext4/resize.c                             |   16 
 b/fs/ext4/super.c                              |   15 
 b/fs/ext4/xattr.c                              |    4 
 b/fs/inode.c                                   |   17 
 b/fs/jbd2/checkpoint.c                         |   10 
 b/fs/jbd2/commit.c                             |  198 -
 b/fs/jbd2/journal.c                            |    4 
 b/fs/jbd2/recovery.c                           |  151 
 b/fs/jbd2/revoke.c                             |    6 
 b/fs/jbd2/transaction.c                        |   12 
 b/fs/read_write.c                              |    1 
 b/include/asm-arm/bitops.h                     |    2 
 b/include/asm-generic/bitops/ext2-non-atomic.h |    2 
 b/include/asm-generic/bitops/le.h              |    4 
 b/include/asm-m68k/bitops.h                    |    2 
 b/include/asm-m68knommu/bitops.h               |    2 
 b/include/asm-powerpc/bitops.h                 |    4 
 b/include/asm-s390/bitops.h                    |    2 
 b/include/linux/buffer_head.h                  |    2 
 b/include/linux/ext4_fs.h                      |   76 
 b/include/linux/ext4_fs_extents.h              |    4 
 b/include/linux/ext4_fs_i.h                    |    4 
 b/include/linux/ext4_fs_sb.h                   |   52 
 b/include/linux/fs.h                           |   16 
 b/include/linux/jbd2.h                         |    4 
 b/lib/find_next_bit.c                          |   43 
 fs/ext4/Makefile                               |    2 
 fs/ext4/balloc.c                               |  184 -
 fs/ext4/dir.c                                  |   12 
 fs/ext4/extents.c                              |  501 +-
 fs/ext4/file.c                                 |   19 
 fs/ext4/ialloc.c                               |  159 
 fs/ext4/inode.c                                |  381 +-
 fs/ext4/ioctl.c                                |    4 
 fs/ext4/namei.c                                |  131 
 fs/ext4/resize.c                               |   12 
 fs/ext4/super.c                                |  374 +-
 fs/inode.c                                     |   22 
 fs/jbd2/checkpoint.c                           |   12 
 fs/jbd2/commit.c                               |   57 
 fs/jbd2/journal.c                              |  364 +
 fs/jbd2/transaction.c                          |   22 
 include/linux/ext4_fs.h                        |  148 
 include/linux/ext4_fs_extents.h                |   21 
 include/linux/ext4_fs_i.h                      |   21 
 include/linux/ext4_fs_sb.h                     |    3 
 include/linux/fs.h                             |    5 
 include/linux/jbd2.h                           |  131 
 69 files changed, 7773 insertions(+), 898 deletions(-)

[GIT PULL] ext4 update

[Theodore Ts'o]

Hi Linus,

Please pull from:

        git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git for_linus

It contains the following feature enhancements, including support for
the new fallocate() system call.  These have been in -mm for a while,
consensus reached for the fallocate() interface between other filesystem
and architecture maintainers.  Patches to wire up the other arches and
XFS should be showing up shortly after this gets merged into mainline.

Regards,

							- Ted

Alex Tomas (1):
      ext4: Make extents code sanely handle on-disk corruption

Amit Arora (4):
      sys_fallocate() implementation on i386, x86_64 and powerpc
      fallocate support in ext4
      write support for preallocated blocks
      Change on-disk format to support 2^15 uninitialized extents

Andreas Dilger (1):
      ext4: Remove 65000 subdirectory limit

Dave Hansen (1):
      ext4: remove extra IS_RDONLY() check

Dmitry Monakhov (2):
      Fix compilation with EXT_DEBUG, also fix leXX_to_cpu conversions.
      ext4: extent macros cleanup

Eric Sandeen (1):
      Use zero_user_page() in ext4 where possible

Jan Kara (1):
      ext4: copy i_flags to inode flags on write

Jose R. Santos (3):
      ext4: Set the journal JBD2_FEATURE_INCOMPAT_64BIT on large devices
      jbd2: Fix CONFIG_JBD_DEBUG ifdef to be CONFIG_JBD2_DEBUG
      jbd2: Move jbd2-debug file to debugfs

Kalpak Shah (2):
      ext4: Add nanosecond timestamps
      ext4: Expand extra_inodes space per the s_{want,min}_extra_isize fields

Mingming Cao (1):
      ext4: Enable extents by default

Vignesh Babu (1):
      ext4: Use is_power_of_2()

 arch/i386/kernel/syscall_table.S |    1 
 arch/powerpc/kernel/sys_ppc32.c  |    7 
 arch/x86_64/ia32/ia32entry.S     |    1 
 arch/x86_64/ia32/sys_ia32.c      |    8 
 fs/Kconfig                       |   10 
 fs/ext4/balloc.c                 |    4 
 fs/ext4/extents.c                |  706 ++++++++++++++++++++++++++++++---------
 fs/ext4/file.c                   |    1 
 fs/ext4/ialloc.c                 |    8 
 fs/ext4/inode.c                  |  118 +++++-
 fs/ext4/ioctl.c                  |    9 
 fs/ext4/namei.c                  |   76 ++--
 fs/ext4/super.c                  |   50 ++
 fs/ext4/xattr.c                  |  276 ++++++++++++++-
 fs/ext4/xattr.h                  |   17 
 fs/jbd2/journal.c                |   81 +---
 fs/jbd2/recovery.c               |    2 
 fs/open.c                        |   59 +++
 include/asm-i386/unistd.h        |    3 
 include/asm-powerpc/systbl.h     |    1 
 include/asm-powerpc/unistd.h     |    3 
 include/asm-x86_64/unistd.h      |    2 
 include/linux/ext4_fs.h          |  104 +++++
 include/linux/ext4_fs_extents.h  |   49 ++
 include/linux/ext4_fs_i.h        |    5 
 include/linux/ext4_fs_sb.h       |    3 
 include/linux/falloc.h           |    6 
 include/linux/fs.h               |    2 
 include/linux/jbd2.h             |    6 
 include/linux/syscalls.h         |    1 
 30 files changed, 1344 insertions(+), 275 deletions(-)