[Ocfs2-commits] branch, master, updated. 7bb92e14e916d3045829aa113cc356aee3857cd9

Wed Mar 12 11:23:17 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  7bb92e14e916d3045829aa113cc356aee3857cd9 (commit)
       via  1ad6f42423dea799518061a87cf4b226bb93acd6 (commit)
       via  129ab94773d4ad45bb4634a2b2ca75eb4b2f4ca8 (commit)
       via  febf79fa7e5f9163700b4a4f67d38dcebafd2323 (commit)
       via  e8cab6cc1bd6f10fcd4fa0451d913039661b309e (commit)
       via  08a0fa1dec3321e6d285ba5700950c12e8d4fe84 (commit)
       via  c840daf8159d794d22d7219cd2eb8fabdfeb6942 (commit)
       via  efcf783cc280114d1ba640c5cc21a543adc78f66 (commit)
       via  556b9d1ab5e505618b0e4fbcb18aa5aa7664b04a (commit)
       via  8c55390c440fd3064b14c8ec7e4e59706511ee10 (commit)
       via  e1e33080b4a612b642070a3af3894f83966fb2ad (commit)
       via  3a5b408f04379c50eff0a4e08bee8dd302762787 (commit)
       via  123ccda4749ef87becc1f9cd57e52bb03f520739 (commit)
       via  dc67d526400d6c6081847fd18a27d6230fc3327e (commit)
       via  c20d3380801cfdda27765685911925312ef85f21 (commit)
       via  4c2eddbbaaf698c7b24f3b89d8cbc08d0c7538b5 (commit)
       via  4f3c42f75cc7d57c196c82ed94bb0224d7cfefbe (commit)
       via  0be5084e2952f9ba13d9afe1d0b2846d002aa2ba (commit)
      from  c2e6575e809985c9f9f9f954124f0fa1cac04046 (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 7bb92e14e916d3045829aa113cc356aee3857cd9
Author: Sunil Mushran <sunil.mushran at oracle.com>
Date:   Tue Mar 11 16:08:12 2008 -0700

    ocfs2: Fix NULL pointer dereferences in o2net

    Mainline commit cdef59a94c2fc962ada379d4240d556db7b56d55
    Author: Tao Ma <tao.ma at oracle.com>
    Date: Wed, 5 Mar 2008 15:49:55 +0800

    In some situations, ocfs2_set_nn_state might get called with sc = NULL and
    valid = 0. If sc = NULL, we can't dereference it to get the o2nm_node
    member. Instead, do what o2net_initialize_handshake does and use NULL when
    calling o2net_reconnect_delay and o2net_idle_timeout.

    Signed-off-by: Tao Ma <tao.ma at oracle.com>
    Signed-off-by: Mark Fasheh <mark.fasheh at oracle.com>

commit 1ad6f42423dea799518061a87cf4b226bb93acd6
Author: Sunil Mushran <sunil.mushran at oracle.com>
Date:   Tue Mar 11 16:07:55 2008 -0700

    ocfs2/dlm: dlm_thread should not sleep while holding the dlm_spinlock

    Mainline commit c824c3c723f2e37a00b3b739a55b28de595fd72e
    Author: Sunil Mushran <sunil.mushran at oracle.com>
    Date: Sat, 1 Mar 2008 14:04:25 -0800

    This patch addresses the bug in which the dlm_thread could go to sleep
    while holding the dlm_spinlock.

    Signed-off-by: Sunil Mushran <sunil.mushran at oracle.com>
    Signed-off-by: Joel Becker <joel.becker at oracle.com>
    Signed-off-by: Mark Fasheh <mark.fasheh at oracle.com>

commit 129ab94773d4ad45bb4634a2b2ca75eb4b2f4ca8
Author: Sunil Mushran <sunil.mushran at oracle.com>
Date:   Tue Mar 11 16:07:41 2008 -0700

    ocfs2/dlm: Print message showing the recovery master

    Mainline commit 535f7026fddafce6d0a0524db01a432c23a0a7b4
    Author: Sunil Mushran <sunil.mushran at oracle.com>
    Date: Sat, 1 Mar 2008 14:04:24 -0800

    Knowing the dlm recovery master helps in debugging recovery
    issues. This patch prints a message on the recovery master node.

    Signed-off-by: Sunil Mushran <sunil.mushran at oracle.com>
    Signed-off-by: Joel Becker <joel.becker at oracle.com>
    Signed-off-by: Mark Fasheh <mark.fasheh at oracle.com>

commit febf79fa7e5f9163700b4a4f67d38dcebafd2323
Author: Sunil Mushran <sunil.mushran at oracle.com>
Date:   Tue Mar 11 16:07:26 2008 -0700

    ocfs2/dlm: Add missing dlm_lockres_put()s

    Mainline commit b31cfc0237f89c3a8bc8f31b5da996e71b543214
    Author: Sunil Mushran <sunil.mushran at oracle.com>
    Date: Sat, 1 Mar 2008 14:04:22 -0800

    dlm_master_request_handler() forgot to put a lockres when
    dlm_assert_master_worker() failed or was skipped.

    Signed-off-by: Sunil Mushran <sunil.mushran at oracle.com>
    Signed-off-by: Joel Becker <joel.becker at oracle.com>
    Signed-off-by: Mark Fasheh <mark.fasheh at oracle.com>

commit e8cab6cc1bd6f10fcd4fa0451d913039661b309e
Author: Sunil Mushran <sunil.mushran at oracle.com>
Date:   Tue Mar 11 16:07:06 2008 -0700

    ocfs2/dlm: Add missing dlm_lockres_put()s in migration path

    Mainline commit 52987e2ab456c1a828046494aac53819b1454341
    Author: Sunil Mushran <sunil.mushran at oracle.com>
    Date: Sat, 1 Mar 2008 14:04:21 -0800

    During migration, the recovery master node may be asked to master a lockres
    it may not know about. In that case, it would not only have to create a
    lockres and add it to the hash, but also remember to to do the _put_
    corresponding to the kref_init in dlm_init_lockres(), as soon as the migration
    is completed. Yes, we don't wait for the dlm_purge_lockres() to do that
    matching put. Note the ref added for it being in the hash protects the lockres
    from being freed prematurely.

    This patch adds that missing put, as described above, to plug a memleak.

    Signed-off-by: Sunil Mushran <sunil.mushran at oracle.com>
    Signed-off-by: Joel Becker <joel.becker at oracle.com>
    Signed-off-by: Mark Fasheh <mark.fasheh at oracle.com>

commit 08a0fa1dec3321e6d285ba5700950c12e8d4fe84
Author: Sunil Mushran <sunil.mushran at oracle.com>
Date:   Tue Mar 11 16:06:48 2008 -0700

    ocfs2/dlm: Add missing dlm_lock_put()s

    Mainline commit 2c5c54aca9d0263f81bd4886232835ba31f7635a
    Author: Sunil Mushran <sunil.mushran at oracle.com>
    Date: Sat, 1 Mar 2008 14:04:20 -0800

    Normally locks for remote nodes are freed when that node sends an UNLOCK
    message to the master. The master node tags an DLM_UNLOCK_FREE_LOCK action
    to do an extra put on the lock at the end.

    However, there are times when the master node has to free the locks for the
    remote nodes forcibly.

    Two cases when this happens are:
    1. When the master has migrated the lockres plus all locks to another node.
    2. When the master is clearing all the locks of a dead node.

    It was in the above two conditions that the dlm was missing the extra put.

    Signed-off-by: Sunil Mushran <sunil.mushran at oracle.com>
    Signed-off-by: Joel Becker <joel.becker at oracle.com>
    Signed-off-by: Mark Fasheh <mark.fasheh at oracle.com>

commit c840daf8159d794d22d7219cd2eb8fabdfeb6942
Author: Sunil Mushran <sunil.mushran at oracle.com>
Date:   Tue Mar 11 16:06:29 2008 -0700

    ocfs2: Fix an endian bug in online resize

    Mainline commit 4338ab6a750303cbae4cc76cc7de5edba6598ebe
    Author: Tao Ma <tao.ma at oracle.com>
    Date: Mon, 3 Mar 2008 10:53:02 +0800

    In ocfs2_group_add, 'cr' is a disk field of type 'ocfs2_chain_rec', and we
    were putting cpu byteorder values into it. Swap things to the right endian
    before storing.

    Signed-off-by: Tao Ma <tao.ma at oracle.com>
    Signed-off-by: Mark Fasheh <mark.fasheh at oracle.com>

commit efcf783cc280114d1ba640c5cc21a543adc78f66
Author: Sunil Mushran <sunil.mushran at oracle.com>
Date:   Tue Mar 11 16:04:25 2008 -0700

    ocfs2: Fix endian bug in o2dlm protocol negotiation.

    Mainline commit 0f71b7b40f55de909e40fa5ab217a5da3439c7d8
    Author: Joel Becker <joel.becker at oracle.com>
    Date: Tue, 12 Feb 2008 14:56:25 -0800

    struct dlm_query_join_packet is made up of four one-byte fields.  They
    are effectively in big-endian order already.  However, little-endian
    machines swap them before putting the packet on the wire (because
    query_join's response is a status, and that status is treated as a u32
    on the wire).  Thus, a big-endian and little-endian machines will
    treat this structure differently.

    The solution is to have little-endian machines swap the structure when
    converting from the structure to the u32 representation.

    Signed-off-by: Joel Becker <joel.becker at oracle.com>
    Signed-off-by: Mark Fasheh <mark.fasheh at oracle.com>

commit 556b9d1ab5e505618b0e4fbcb18aa5aa7664b04a
Author: Sunil Mushran <sunil.mushran at oracle.com>
Date:   Tue Mar 11 16:03:59 2008 -0700

    ocfs2: Use dlm_print_one_lock_resource for lock resource print

    Mainline commit 2af37ce82d199d1d8cd6286f42f37d321627a807
    Author: Tao Ma <tao.ma at oracle.com>
    Date: Thu, 28 Feb 2008 10:41:55 +0800

    __dlm_print_one_lock_resource must be called with spin_lock
    the res->spinlock. While in some cases, we use it without this
    precondition and lead to the failure of assert_spin_locked.
    So call dlm_print_one_lock_resource instead.

    Signed-off-by: Tao Ma <tao.ma at oracle.com>
    Signed-off-by: Mark Fasheh <mark.fasheh at oracle.com>

commit 8c55390c440fd3064b14c8ec7e4e59706511ee10
Author: Sunil Mushran <sunil.mushran at oracle.com>
Date:   Tue Mar 11 16:03:02 2008 -0700

    ocfs2/dlm: fix printk warning

    Mainline commit 3a4780a85d4a160a471ed887bfce58b414f556b1
    Author: Andrew Morton <akpm at linux-foundation.org>
    Date: Fri, 29 Feb 2008 01:56:06 -0800

    fs/ocfs2/dlm/dlmdomain.c: In function 'dlm_send_join_cancels':
    fs/ocfs2/dlm/dlmdomain.c:983: warning: format '%u' expects type 'unsigned int', but argument 7 has type 'long unsigned int'

    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Mark Fasheh <mark.fasheh at oracle.com>

commit e1e33080b4a612b642070a3af3894f83966fb2ad
Author: Sunil Mushran <sunil.mushran at oracle.com>
Date:   Thu Mar 6 17:54:32 2008 -0800

    ocfs2: Correct use of ! and & in aops.c

    Mainline commit 86c838b03daf35e2af6555842d04fe09a89f8d93
    Author: Julia Lawall <julia at diku.dk>
    Date: Tue, 26 Feb 2008 21:45:56 +0100

    In mainline commit e6bafba5b4765a5a252f1b8d31cbf6d2459da337, a bug was fixed that
    involved converting !x & y to !(x & y).  The code below shows the same
    pattern, and thus should perhaps be fixed in the same way.

    This is not tested and clearly changes the semantics, so it is only
    something to consider.

    Signed-off-by: Julia Lawall <julia at diku.dk>
    Signed-off-by: Mark Fasheh <mark.fasheh at oracle.com>

commit 3a5b408f04379c50eff0a4e08bee8dd302762787
Author: Sunil Mushran <sunil.mushran at oracle.com>
Date:   Thu Mar 6 17:53:28 2008 -0800

    ocfs2: make dlm_do_assert_master() static

    Mainline commit 05488bbebe3deedbc5d58a1832f563ff96bc2ef6
    Author: Adrian Bunk <bunk at kernel.org>
    Date: Sun, 17 Feb 2008 10:20:41 +0200

    This patch makes the needlessly global dlm_do_assert_master() static.

    Signed-off-by: Adrian Bunk <bunk at kernel.org>
    Signed-off-by: Mark Fasheh <mark.fasheh at oracle.com>

commit 123ccda4749ef87becc1f9cd57e52bb03f520739
Author: Sunil Mushran <sunil.mushran at oracle.com>
Date:   Thu Mar 6 17:52:53 2008 -0800

    ocfs2: make ocfs2_downconvert_thread() static

    Mainline commit 200bfae37a15e50e0f9aa5683958bdfc3fd55e05
    Author: Adrian Bunk <bunk at kernel.org>
    Date: Sun, 17 Feb 2008 10:20:38 +0200

    This patch makes the needlessly global ocfs2_downconvert_thread()
    static.

    Signed-off-by: Adrian Bunk <bunk at kernel.org>
    Signed-off-by: Mark Fasheh <mark.fasheh at oracle.com>

commit dc67d526400d6c6081847fd18a27d6230fc3327e
Author: Sunil Mushran <sunil.mushran at oracle.com>
Date:   Thu Mar 6 17:51:36 2008 -0800

    ocfs2: possible cleanups

    Mainline commit 006000566d4e95b8d1924addfb41094acf0d5ec2
    Author: Adrian Bunk <bunk at kernel.org>
    Date: Tue, 29 Jan 2008 00:11:41 +0200

    This patch contains the following cleanups that are now possible:
    - make the following needlessly global functions static:
      - dlmglue.c:ocfs2_process_blocked_lock()
      - heartbeat.c:ocfs2_node_map_init()
    - #if 0 the following unused global function plus support functions:
      - heartbeat.c:ocfs2_node_map_is_only()

    Signed-off-by: Adrian Bunk <bunk at kernel.org>
    Signed-off-by: Mark Fasheh <mark.fasheh at oracle.com>

commit c20d3380801cfdda27765685911925312ef85f21
Author: Sunil Mushran <sunil.mushran at oracle.com>
Date:   Thu Mar 6 17:49:58 2008 -0800

    ocfs2: Fix writeout in ocfs2_data_convert_worker()

    Mainline commit 1044e401af9a309637828aa3cc8f3b6409fcbf4e
    Author: Mark Fasheh <mark.fasheh at oracle.com>
    Date: Thu, 28 Feb 2008 17:16:03 -0800

    Mainline commit f1f540688eae66c274ff1c1133b5d9c687b28f58 "optimized"
    ocfs2_data_convert_worker() to "only do work for regular files".
    Unfortunately, I left out a '!', which casued it to *skip* regular files.
    This was hidden from testing until recently because the default data
    journaling mode (data=ordered) doesn't exercise this code.

    Signed-off-by: Mark Fasheh <mark.fasheh at oracle.com>
    Signed-off-by: Joel Becker <joel.becker at oracle.com>

commit 4c2eddbbaaf698c7b24f3b89d8cbc08d0c7538b5
Author: Sunil Mushran <sunil.mushran at oracle.com>
Date:   Thu Mar 6 18:33:57 2008 -0800

    ocfs2: Negotiate locking protocol versions.

    Mainline commit d24fbcda0c4988322949df3d759f1cfb32b32953
    Author: Joel Becker <Joel.Becker at oracle.com>
    Date: Fri, 25 Jan 2008 17:02:21 -0800

    Currently, when ocfs2 nodes connect via TCP, they advertise their
    compatibility level.  If the versions do not match, two nodes cannot speak
    to each other and they disconnect. As a result, this provides no forward or
    backwards compatibility.

    This patch implements a simple protocol negotiation at the dlm level by
    introducing a major/minor version number scheme for entities that
    communicate.  Specifically, o2dlm has a major/minor version for interaction
    with o2dlm on other nodes, and ocfs2 itself has a major/minor version for
    interacting with the filesystem on other nodes.

    This will allow rolling upgrades of ocfs2 clusters when changes to the
    locking or network protocols can be done in a backwards compatible manner.
    In those cases, only the minor number is changed and the negotatied protocol
    minor is returned from dlm join. In the far less likely event that a
    required protocol change makes backwards compatibility impossible, we simply
    bump the major number.

    Signed-off-by: Joel Becker <joel.becker at oracle.com>
    Signed-off-by: Mark Fasheh <mark.fasheh at oracle.com>

commit 4f3c42f75cc7d57c196c82ed94bb0224d7cfefbe
Author: Sunil Mushran <sunil.mushran at oracle.com>
Date:   Tue Mar 11 16:14:57 2008 -0700

    ocfs2: Spelling fixes

    Mainline commit c78bad11fbf1272ea021f56458025dc98486d6f4
    Author: Joe Perches <joe at perches.com>
    Date: Sun, 3 Feb 2008 17:33:42 +0200

    This patch includes the ocfs2 relevant changes from the above
    mainline commit.

    Signed-off-by: Joe Perches <joe at perches.com>
    Signed-off-by: Adrian Bunk <bunk at kernel.org>

commit 0be5084e2952f9ba13d9afe1d0b2846d002aa2ba
Author: Sunil Mushran <sunil.mushran at oracle.com>
Date:   Wed Mar 12 11:19:31 2008 -0700

    ocfs2: Add helper task_pid_nr

    Commit 7af5729474b5b8ad385adadab78d6e723e7655a3 in mainline introduced
    helper task_pid_nr(). This patch allows one to build ocfs2 with kernels
    having/not having that change.

    Signed-off-by: Sunil Mushran <sunil.mushran at oracle.com>
    Signed-off-by: Joel Becker <joel.becker at oracle.com>

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

Summary of changes:
 Makefile                          |    3 +-
 configure.in                      |    5 +
 fs/ocfs2/alloc.c                  |    2 +-
 fs/ocfs2/aops.c                   |    2 +-
 fs/ocfs2/cluster/tcp.c            |    9 +-
 fs/ocfs2/cluster/tcp_internal.h   |   11 ++-
 fs/ocfs2/dir.c                    |    2 +-
 fs/ocfs2/dlm/dlmapi.h             |    7 +-
 fs/ocfs2/dlm/dlmcommon.h          |   27 +++++-
 fs/ocfs2/dlm/dlmconvert.c         |    2 +-
 fs/ocfs2/dlm/dlmdomain.c          |  226 ++++++++++++++++++++++++++++++++-----
 fs/ocfs2/dlm/dlmfs.c              |   15 +++-
 fs/ocfs2/dlm/dlmmaster.c          |   24 +++-
 fs/ocfs2/dlm/dlmrecovery.c        |   57 ++++++++--
 fs/ocfs2/dlm/dlmthread.c          |    6 +-
 fs/ocfs2/dlm/userdlm.c            |    5 +-
 fs/ocfs2/dlm/userdlm.h            |    3 +-
 fs/ocfs2/dlmglue.c                |   37 +++++-
 fs/ocfs2/dlmglue.h                |    3 +-
 fs/ocfs2/heartbeat.c              |   26 ++--
 fs/ocfs2/heartbeat.h              |    5 -
 fs/ocfs2/ocfs1_fs_compat.h        |    2 +-
 fs/ocfs2/ocfs2.h                  |    1 +
 fs/ocfs2/ocfs2_lockingver.h       |   30 +++++
 fs/ocfs2/resize.c                 |    2 +-
 fs/ocfs2/suballoc.c               |    2 +-
 fs/ocfs2/super.c                  |    1 +
 kapi-compat/include/task_pid_nr.h |   12 ++
 28 files changed, 437 insertions(+), 90 deletions(-)
 create mode 100644 fs/ocfs2/ocfs2_lockingver.h
 create mode 100644 kapi-compat/include/task_pid_nr.h

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