[Ocfs2-commits] branch, master, updated. ocfs2-1.4.0-201-g3dadccc

Mon Sep 13 13:38:41 PDT 2010

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  3dadccc3ea8f90f3ca1ed2137e2f00e95a3beab8 (commit)
       via  e0967514fe14310b4a04f9d253e739eacff839ef (commit)
       via  31ede41a4da0a103eaf22df36fa34b46fdf43205 (commit)
       via  ab6f4755669f06c02c0c6f253925f0bf24321431 (commit)
       via  702da0ffdb274091c19d9449d9f156b2aee4afc5 (commit)
       via  1bf936f1198214c91c381a3ed987d5443053c1cd (commit)
       via  481515842a6f2d659ef1e18ef70aa8cee012ff2e (commit)
      from  b039e1273837897b12b0e346f2ba5982713b15f7 (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 3dadccc3ea8f90f3ca1ed2137e2f00e95a3beab8
Author: Dan Carpenter <error27 at gmail.com>
Date:   Mon Sep 13 12:48:10 2010 -0700

    ocfs2: tighten up strlen() checking

    Mainline Commit e372357ba55ae89307af15cd680467d8f0db4f01
    This function is only called from one place and it's like this:
    	dlm_register_domain(conn->cc_name, dlm_key, &fs_version);

    The "conn->cc_name" is 64 characters long.  If strlen(conn->cc_name)
    were equal to O2NM_MAX_NAME_LEN (64) that would be a bug because
    strlen() doesn't count the NULL character.

    In fact, if you look how O2NM_MAX_NAME_LEN is used, it mostly describes
    64 character buffers.  The only exception is nd_name from struct
    o2nm_node.

    Anyway I looked into it and in this case the domain string comes from
    osb->uuid_str in ocfs2_setup_osb_uuid().  That's 32 characters and NULL
    which easily fits into O2NM_MAX_NAME_LEN.  This patch doesn't change how
    the code works, but I think it makes the code a little cleaner.

    Signed-off-by: Dan Carpenter <error27 at gmail.com>
    Signed-off-by: Joel Becker <joel.becker at oracle.com>

commit e0967514fe14310b4a04f9d253e739eacff839ef
Author: Tao Ma <tao.ma at oracle.com>
Date:   Mon Sep 13 12:33:10 2010 -0700

    ocfs2: Remove the redundant cpu_to_le64.

    Mainline Commit 0a463b74e7e6856b24e613de2b85237c6e11890b
    In ocfs2_block_group_alloc, we set c_blkno by bg->bg_blkno.
    But actually bg->bg_blkno is already changed to little endian
    in ocfs2_block_group_fill. So remove the extra cpu_to_le64.

    Reported-by: Marcos Matsunaga <Marcos.Matsunaga at oracle.com>
    Signed-off-by: Tao Ma <tao.ma at oracle.com>
    Signed-off-by: Joel Becker <joel.becker at oracle.com>

commit 31ede41a4da0a103eaf22df36fa34b46fdf43205
Author: Tao Ma <tao.ma at oracle.com>
Date:   Mon Sep 13 12:30:29 2010 -0700

    ocfs2: Move orphan scan work to ocfs2_wq.

    Mainline Commit 40f165f416bde747d85cdf71bc9dde700912f71f
    We used to let orphan scan work in the default work queue,
    but there is a corner case which will make the system deadlock.
    The scenario is like this:
    1. set heartbeat threadshold to 200. this will allow us to have a
       great chance to have a orphan scan work before our quorum decision.
    2. mount node 1.
    3. after 1~2 minutes, mount node 2(in order to make the bug easier
       to reproduce, better add maxcpus=1 to kernel command line).
    4. node 1 do orphan scan work.
    5. node 2 do orphan scan work.
    6. node 1 do orphan scan work. After this, node 1 hold the orphan scan
       lock while node 2 know node 1 is the master.
    7. ifdown eth2 in node 2(eth2 is what we do ocfs2 interconnection).

    Now when node 2 begins orphan scan, the system queue is blocked.

    The root cause is that both orphan scan work and quorum decision work
    will use the system event work queue. orphan scan has a chance of
    blocking the event work queue(in dlm_wait_for_node_death) so that there
    is no chance for quorum decision work to proceed.

    This patch resolve it by moving orphan scan work to ocfs2_wq.

    Signed-off-by: Tao Ma <tao.ma at oracle.com>
    Signed-off-by: Joel Becker <joel.becker at oracle.com>

commit ab6f4755669f06c02c0c6f253925f0bf24321431
Author: Sunil Mushran <sunil.mushran at oracle.com>
Date:   Mon Sep 13 12:43:27 2010 -0700

    ocfs2: Make nointr a default mount option

    Mainline Commit 4b37fcb7d41ce3b9264b9562d6ffd62db9294bd1
    OCFS2 has never really supported intr. This patch acknowledges this reality
    and makes nointr the default mount option. In a later patch, we intend to
    support intr.

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

commit 702da0ffdb274091c19d9449d9f156b2aee4afc5
Author: Wengang Wang <wen.gang.wang at oracle.com>
Date:   Mon Sep 13 10:50:21 2010 -0700

    ocfs2: print node # when tcp fails

    Mainline Commit a5196ec5ef80309fd390191c548ee1f2e8a327ee
    Print the node number of a peer node if sending it a message failed.

    Signed-off-by: Wengang Wang <wen.gang.wang at oracle.com>
    Signed-off-by: Joel Becker <joel.becker at oracle.com>

commit 1bf936f1198214c91c381a3ed987d5443053c1cd
Author: Joel Becker <joel.becker at oracle.com>
Date:   Mon Sep 13 10:48:59 2010 -0700

    ocfs2_dlmfs: Fix math error when reading LVB.

    Mainline Commit a36d515c7a2dfacebcf41729f6812dbc424ebcf0
    When asked for a partial read of the LVB in a dlmfs file, we can
    accidentally calculate a negative count.

    Reported-by: Dan Carpenter <error27 at gmail.com>
    Cc: <stable at kernel.org>
    Signed-off-by: Joel Becker <joel.becker at oracle.com>

commit 481515842a6f2d659ef1e18ef70aa8cee012ff2e
Author: Wengang Wang <wen.gang.wang at oracle.com>
Date:   Mon Sep 13 10:31:19 2010 -0700

    ocfs2: Check the owner of a lockres inside the spinlock

    Mainline Commit 428257f8870f0e72e85ce782d091fa1f366de7df

    The checking of lockres owner in dlm_update_lvb() is not inside spinlock
    protection. I don't see problem in current call path of dlm_update_lvb().
    But just for code robustness.

    Signed-off-by: Wengang Wang <wen.gang.wang at oracle.com>
    Signed-off-by: Joel Becker <joel.becker at oracle.com>

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

Summary of changes:
 fs/ocfs2/dlm/dlmast.c      |    9 +++++----
 fs/ocfs2/dlm/dlmconvert.c  |    4 +++-
 fs/ocfs2/dlm/dlmdomain.c   |   21 ++++++++++++++-------
 fs/ocfs2/dlm/dlmfs.c       |    2 +-
 fs/ocfs2/dlm/dlmlock.c     |    4 +++-
 fs/ocfs2/dlm/dlmmaster.c   |   12 +++++++++---
 fs/ocfs2/dlm/dlmrecovery.c |   27 ++++++++++++++++++---------
 fs/ocfs2/dlm/dlmunlock.c   |    3 ++-
 fs/ocfs2/journal.c         |    6 +++---
 fs/ocfs2/suballoc.c        |    2 +-
 fs/ocfs2/super.c           |    2 +-
 11 files changed, 60 insertions(+), 32 deletions(-)

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