[Ocfs2-commits] branch, master, updated. ocfs2-1.4.0-55-gbd945b8

Mon Jul 21 15:40:11 PDT 2008

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The ocfs2 filesystem version 1.4".

The branch, master has been updated
       via  bd945b84a24d3602a6eb7dbe85fb6560df8e67a0 (commit)
       via  e9dac0155dcc5f3af6815cfe37cf7d590ecec3e6 (commit)
       via  86c88f735ea8f91897333b35584212571ab93d97 (commit)
       via  62adc333788e2f2f043a52fcb407feda9775c728 (commit)
       via  94a21b0e56de449874e4f4ebf9684d10385a6040 (commit)
       via  5fcc4de4b01d95a33f157cec0d229d83c83022ee (commit)
       via  a227efc0320a7e49dc731cad52bf023d3e286531 (commit)
       via  34e63f1e13909d97f8d0281ba38c46f347496e02 (commit)
       via  7f60a3a3db5ece42ee60f0790e834b7d96b4cc86 (commit)
       via  80824336a41d1fc82eecd15896fa77e27afdd09a (commit)
       via  8b3b7a7a75bdf5e16635670f3e806d44116298e0 (commit)
       via  76e34d536b868c98fbc7fe0cee832073545367e1 (commit)
       via  e192847a01546c0b6ecefdd2268e06f258ff460a (commit)
       via  aaf22e90761d5309d4c451ba8c8621892d2daebe (commit)
       via  27e7132609bd61b9faeb00a07f6c6f0faa40d286 (commit)
       via  defb840569ccce71ce8d2bfcb5a1d5a27bda8a69 (commit)
      from  95bd0768f44f8a4cb6b4de8235eeeed8b933621f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit bd945b84a24d3602a6eb7dbe85fb6560df8e67a0
Author: Sunil Mushran <sunil.mushran at oracle.com>
Date:   Mon Jul 21 15:24:49 2008 -0700

    ocfs2: Enable CONFIG_OCFS2_FS_STATS

    Signed-off-by: Sunil Mushran <sunil.mushran at oracle.com>

commit e9dac0155dcc5f3af6815cfe37cf7d590ecec3e6
Author: Sunil Mushran <sunil.mushran at oracle.com>
Date:   Mon Jul 21 15:13:19 2008 -0700

    ocfs2: Up version to 1.4.1

    Signed-off-by: Sunil Mushran <sunil.mushran at oracle.com>

commit 86c88f735ea8f91897333b35584212571ab93d97
Author: Sunil Mushran <sunil.mushran at oracle.com>
Date:   Mon Jul 21 12:19:35 2008 -0700

    ocfs2: Fix oops when racing files truncates with writes into an mmap region

    This patch fixes an oops that is reproduced when one races writes to a mmap-ed
    region with another process truncating the file.

    Signed-off-by: Sunil Mushran <sunil.mushran at oracle.com>
    Signed-off-by: Mark Fasheh <mfasheh at suse.com>

commit 62adc333788e2f2f043a52fcb407feda9775c728
Author: Sunil Mushran <sunil.mushran at oracle.com>
Date:   Mon Jul 21 12:20:00 2008 -0700

    ocfs2: Fix race between mount and recovery

    As the fs recovery is asynchronous, there is a small chance that another
    node can mount (and thus recover) the slot before the recovery thread
    gets to it.

    If this happens, the recovery thread will block indefinitely on the
    journal/slot lock as that lock will be held for the duration of the mount
    (by design) by the node assigned to that slot.

    The solution implemented is to keep track of the journal replays using
    a recovery generation in the journal inode, which will be incremented by the
    thread replaying that journal. The recovery thread, before attempting the
    blocking lock on the journal/slot lock, will compare the generation on disk
    with what it has cached and skip recovery if it does not match.

    This bug appears to have been inadvertently introduced during the mount/umount
    vote removal by mainline commit 34d024f84345807bf44163fac84e921513dde323. In the
    mount voting scheme, the messaging would indirectly indicate that the slot
    was being recovered.

    Signed-off-by: Sunil Mushran <sunil.mushran at oracle.com>
    Signed-off-by: Mark Fasheh <mfasheh at suse.com>

commit 94a21b0e56de449874e4f4ebf9684d10385a6040
Author: Sunil Mushran <sunil.mushran at oracle.com>
Date:   Mon Jul 21 12:18:53 2008 -0700

    ocfs2: Add counter in struct ocfs2_dinode to track journal replays

    This patch renames the ij_pad to ij_recovery_generation in struct ocfs2_dinode.
    This will be used to keep count of journal replays after an unclean shutdown.

    Signed-off-by: Sunil Mushran <sunil.mushran at oracle.com>
    Signed-off-by: Mark Fasheh <mfasheh at suse.com>

commit 5fcc4de4b01d95a33f157cec0d229d83c83022ee
Author: Coly Li <coyli at suse.de>
Date:   Mon Jul 21 11:40:52 2008 -0700

    ocfs2: fix oops in mmap_truncate testing

    Mainline commit c0420ad2ca514551ca086510b0e7d17a05c70492

    This patch fixes a mmap_truncate bug which was found by ocfs2 test suite.

    In an ocfs2 cluster more than 1 node, run program mmap_truncate, which races
    mmap writes and truncates from multiple processes. While the test is
    running, a stat from another node forces writeout, causing an oops in
    ocfs2_get_block() because it sees a buffer to write which isn't allocated.

    This patch fixed the bug by clear dirty and uptodate bits in buffer, leave
    the buffer unmapped and return.

    Fix is suggested by Mark Fasheh, and I code up the patch.

    Signed-off-by: Coly Li <coyli at suse.de>
    Signed-off-by: Mark Fasheh <mfasheh at suse.com>

commit a227efc0320a7e49dc731cad52bf023d3e286531
Author: Joel Becker <joel.becker at oracle.com>
Date:   Mon Jul 21 11:40:23 2008 -0700

    ocfs2: Don't snprintf() without a format

    Mainline commit fe9f387740ac7cb3b7c2fffa76807e997e6c6292

    Some system files are per-slot.  Their names include the slot number.
    ocfs2_sprintf_system_inode_name() uses the system inode definitions to
    fill in the slot number with snprintf().

    For global system files, there is no node number, and the name was
    printed as a format with no arguments.  -Wformat-nonliteral and
    -Wformat-security don't like this.  Instead, use a static "%s" format
    and the name as the argument.

    Signed-off-by: Joel Becker <joel.becker at oracle.com>

commit 34e63f1e13909d97f8d0281ba38c46f347496e02
Author: Joel Becker <joel.becker at oracle.com>
Date:   Mon Jul 21 11:40:05 2008 -0700

    ocfs2: Fix CONFIG_OCFS2_DEBUG_FS #ifdefs

    Mainline commit e407e39783a7206d20b3e9961aedf272de966e31

    A couple places use OCFS2_DEBUG_FS where they really mean
    CONFIG_OCFS2_DEBUG_FS.

    Reported-by: Robert P. J. Day <rpjday at crashcourse.ca>
    Signed-off-by: Joel Becker <joel.becker at oracle.com>

commit 7f60a3a3db5ece42ee60f0790e834b7d96b4cc86
Author: Sunil Mushran <sunil.mushran at oracle.com>
Date:   Mon Jul 21 11:39:47 2008 -0700

    ocfs2/net: Silence build warnings on sparc64

    Mainline commit 461c6a30eca6f25add1dadb9fd8a1d8e89a6e627

    suseconds_t is type long on most arches except sparc64 where it is type int.
    This patch silences the following warnings that are generated when building
    on it.

    netdebug.c: In function 'nst_seq_show':
    netdebug.c:152: warning: format '%lu' expects type 'long unsigned int', but argument 13 has type 'suseconds_t'
    netdebug.c:152: warning: format '%lu' expects type 'long unsigned int', but argument 15 has type 'suseconds_t'
    netdebug.c:152: warning: format '%lu' expects type 'long unsigned int', but argument 17 has type 'suseconds_t'
    netdebug.c: In function 'sc_seq_show':
    netdebug.c:332: warning: format '%lu' expects type 'long unsigned int', but argument 19 has type 'suseconds_t'
    netdebug.c:332: warning: format '%lu' expects type 'long unsigned int', but argument 21 has type 'suseconds_t'
    netdebug.c:332: warning: format '%lu' expects type 'long unsigned int', but argument 23 has type 'suseconds_t'
    netdebug.c:332: warning: format '%lu' expects type 'long unsigned int', but argument 25 has type 'suseconds_t'
    netdebug.c:332: warning: format '%lu' expects type 'long unsigned int', but argument 27 has type 'suseconds_t'
    netdebug.c:332: warning: format '%lu' expects type 'long unsigned int', but argument 29 has type 'suseconds_t'

    Signed-off-by: Sunil Mushran <sunil.mushran at oracle.com>
    Signed-off-by: Mark Fasheh <mfasheh at suse.com>

commit 80824336a41d1fc82eecd15896fa77e27afdd09a
Author: Wengang Wang <wen.gang.wang at oracle.com>
Date:   Mon Jul 21 11:39:26 2008 -0700

    ocfs2: Handle error during journal load

    Mainline commit 01af482037d32c215aab208a0b110ffe6fd782c0

    This patch ensures the mount fails if the fs is unable to load the journal.

    Signed-off-by: Wengang Wang <wen.gang.wang at oracle.com>
    Acked-by: Sunil Mushran <sunil.mushran at oracle.com>
    Signed-off-by: Mark Fasheh <mfasheh at suse.com>

commit 8b3b7a7a75bdf5e16635670f3e806d44116298e0
Author: Sunil Mushran <sunil.mushran at oracle.com>
Date:   Mon Jul 21 11:39:08 2008 -0700

    ocfs2: Silence an error message in ocfs2_file_aio_read()

    Mainline commit 56753bd3b9220f6f2477eb1cf97f40c24e0a4c91

    This patch silences an EINVAL error message in ocfs2_file_aio_read()
    that is always due to a user error.

    Signed-off-by: Sunil Mushran <sunil.mushran at oracle.com>
    Signed-off-by: Mark Fasheh <mfasheh at suse.com>

commit 76e34d536b868c98fbc7fe0cee832073545367e1
Author: Randy Dunlap <randy.dunlap at oracle.com>
Date:   Mon Jul 21 11:38:46 2008 -0700

    ocfs2: fix printk format warnings with OCFS2_FS_STATS=n

    Mainline commit dd25e55ea133b14678cfaa9e205b082b24b26dbc

    Fix printk format warnings when OCFS2_FS_STATS=n:

    linux-next-20080528/fs/ocfs2/dlmglue.c: In function 'ocfs2_dlm_seq_show':
    linux-next-20080528/fs/ocfs2/dlmglue.c:2623: warning: format '%llu' expects type 'long long unsigned int', but argument 3 has type 'int'
    linux-next-20080528/fs/ocfs2/dlmglue.c:2623: warning: format '%llu' expects type 'long long unsigned int', but argument 4 has type 'int'
    linux-next-20080528/fs/ocfs2/dlmglue.c:2623: warning: format '%llu' expects type 'long long unsigned int', but argument 7 has type 'int'
    linux-next-20080528/fs/ocfs2/dlmglue.c:2623: warning: format '%llu' expects type 'long long unsigned int', but argument 8 has type 'int'

    Signed-off-by: Randy Dunlap <randy.dunlap at oracle.com>
    Signed-off-by: Mark Fasheh <mfasheh at suse.com>

commit e192847a01546c0b6ecefdd2268e06f258ff460a
Author: Sunil Mushran <sunil.mushran at oracle.com>
Date:   Mon Jul 21 11:38:28 2008 -0700

    ocfs2: Instrument fs cluster locks

    Mainline commit 8ddb7b004dfa1832a750e199df8bff4b75b73565

    This patch adds code to track the number of times the fs takes
    various cluster locks as well as the times associated with it.
    The information is made available to users via debugfs.

    This patch was originally written by Jan Kara <jack at suse.cz>.

    Signed-off-by: Sunil Mushran <sunil.mushran at oracle.com>
    Signed-off-by: Mark Fasheh <mfasheh at suse.com>

commit aaf22e90761d5309d4c451ba8c8621892d2daebe
Author: Sunil Mushran <sunil.mushran at oracle.com>
Date:   Mon Jul 21 11:37:38 2008 -0700

    ocfs2/net: Silence build warnings

    Mainline commit 0f475b2abed6cbccee1da20a0bef2895eb2a0edd

    This patch silences the build warnings concerning o2net_init_nst()
    and friends when building without CONFIG_DEBUG_FS enabled.

    Signed-off-by: Sunil Mushran <sunil.mushran at oracle.com>
    Signed-off-by: Mark Fasheh <mfasheh at suse.com>

commit 27e7132609bd61b9faeb00a07f6c6f0faa40d286
Author: Sunil Mushran <sunil.mushran at oracle.com>
Date:   Mon Jul 21 11:37:18 2008 -0700

    ocfs2/dlm: Silence build warnings

    Mainline commit 959040c37a8cae8117907d4aed87f1b01ff1ea19

    This patch silences the build warnings concerning dlm_debug_init()
    and friends when building without CONFIG_DEBUG_FS enabled.

    Signed-off-by: Sunil Mushran <sunil.mushran at oracle.com>
    Signed-off-by: Mark Fasheh <mfasheh at suse.com>

commit defb840569ccce71ce8d2bfcb5a1d5a27bda8a69
Author: Sunil Mushran <sunil.mushran at oracle.com>
Date:   Mon Jul 21 11:36:17 2008 -0700

    ocfs2/net: Silence build warnings

    Mainline commit 271d772d02507c7541d5e6b4938ed2380e59a39a

    This patch silences the build warnings concerning o2net_debugfs_init()
    and friends when building without CONFIG_DEBUG_FS enabled.

    Signed-off-by: Sunil Mushran <sunil.mushran at oracle.com>
    Signed-off-by: Mark Fasheh <mfasheh at suse.com>

-----------------------------------------------------------------------

Summary of changes:
 configure.in                    |    2 +-
 fs/ocfs2/Makefile               |    2 +
 fs/ocfs2/aops.c                 |   40 ++++++---
 fs/ocfs2/cluster/netdebug.c     |    8 +-
 fs/ocfs2/cluster/tcp.c          |   28 ++----
 fs/ocfs2/cluster/tcp.h          |   12 ++--
 fs/ocfs2/cluster/tcp_internal.h |   32 +++++++
 fs/ocfs2/dlm/dlmdebug.h         |   12 ++--
 fs/ocfs2/dlmglue.c              |  122 +++++++++++++++++++++++++++-
 fs/ocfs2/file.c                 |    2 +-
 fs/ocfs2/journal.c              |  176 ++++++++++++++++++++++++++++++---------
 fs/ocfs2/journal.h              |    3 +-
 fs/ocfs2/ocfs2.h                |   14 +++
 fs/ocfs2/ocfs2_fs.h             |    7 +-
 fs/ocfs2/super.c                |   16 ++++-
 15 files changed, 380 insertions(+), 96 deletions(-)

hooks/post-receive
-- 
The ocfs2 filesystem version 1.4