[Ocfs2-commits] branch, master, updated. 43c14d21ae88eaf43603d4903955f7f99d2be551

svn-commits at oss.oracle.com svn-commits at oss.oracle.com
Wed Aug 11 18:31:22 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.8".

The branch, master has been updated
       via  43c14d21ae88eaf43603d4903955f7f99d2be551 (commit)
       via  a1a25c4337ac95ba5dc9fb1341f2a02603e3c0f7 (commit)
       via  d09301b7a1ec530baf63ec572d025624f0cd8d31 (commit)
       via  8196b47fbf1ab2cd09e4f059f8c1eac5b4706d07 (commit)
       via  36b057ad17a76039ee6d196b2f9ea60f724f8289 (commit)
       via  88b33e54667d8b7095ed8c716cf016fdc43cfaa5 (commit)
       via  ce5dbe961e62d34fb335637cd3c652a63421f755 (commit)
       via  f187faa390b1d6d82d5b90a25718beda17ad8514 (commit)
       via  bca6ac9a8ab10f0a4aeac66dac965512d03e8e13 (commit)
       via  4e2eee7a540591cf5434580fc111abe47fed5138 (commit)
       via  6ded84e21bb68970f5983e1a47764f4dc4dfcc4b (commit)
       via  86fc3b98fca27030586e08f65a400709b8ea27d5 (commit)
       via  1cbe6dbc62e199e080c9d7d8ef2e92def0627ad4 (commit)
       via  b90fabd23c00313a35f27a07b083c5b1f7ed6ce8 (commit)
       via  66526c522ef076093d012a8c93461766fde7953d (commit)
       via  547852dba31e4682105440c0aba26ad5ca35ce82 (commit)
       via  bb0f9b464ef89d731e1687172248deab81b656a4 (commit)
       via  1c9d078264622c5ce1410e7f109a5cf612e9e5ff (commit)
       via  11310bb1fd7eb40d5365856c23f0ef6ccbf72af1 (commit)
       via  bc314b72e30d00fb673d4bde7d679d65fcb33f48 (commit)
       via  bee19d850bd92234bb76761bf6accd68b615e6b2 (commit)
       via  3b068eded38766caab676627b1cd0411be0bea84 (commit)
       via  65dcce84b45acf9f8c33e386974640b775e98864 (commit)
       via  f3389819840e8a426f16028f22a91e288816d9a3 (commit)
       via  24c17a7947dd522074398fe6d972575145bb28c2 (commit)
       via  640eae1796d7b84c91d1da3cbcb4e9170c934231 (commit)
       via  ae1e675f79318cec23f1caf02e55c088794c1df3 (commit)
      from  21b8b1ccc3e9f592d6d377d4856aff49834c9a25 (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 43c14d21ae88eaf43603d4903955f7f99d2be551
Author: Joel Becker <joel.becker at oracle.com>
Date:   Fri Jul 16 13:32:33 2010 -0700

    ocfs2: Silence gcc warning in ocfs2_write_zero_page().
    
    Mainline commit 5453258d532e72731b0829e4fefd36dd611a2fff
    
    ocfs2_write_zero_page() has a loop that won't ever be skipped, but gcc
    doesn't know that.  Set ret=0 just to make gcc happy.
    
    Signed-off-by: Joel Becker <joel.becker at oracle.com>

commit a1a25c4337ac95ba5dc9fb1341f2a02603e3c0f7
Author: Wengang Wang <wen.gang.wang at oracle.com>
Date:   Wed Jul 14 22:38:21 2010 +0800

    ocfs2/dlm: Remove BUG_ON from migration in the rare case of a down node
    
    Mainline commit a39953dd95ff10e311083d94f4f95c348cb22464
    
    For migration, we are waiting for DLM_LOCK_RES_MIGRATING flag to be set
    before sending DLM_MIG_LOCKRES_MSG message to the target. We are using
    dlm_migration_can_proceed() for that purpose.  However, if the node is
    down, dlm_migration_can_proceed() will also return "go ahead".  In this
    rare case, the DLM_LOCK_RES_MIGRATING flag might not be set yet. Remove
    the BUG_ON() that trips over this condition.
    
    Signed-off-by: Wengang Wang <wen.gang.wang at oracle.com>
    Signed-off-by: Joel Becker <joel.becker at oracle.com>

commit d09301b7a1ec530baf63ec572d025624f0cd8d31
Author: Tao Ma <tao.ma at oracle.com>
Date:   Wed Jul 14 11:19:32 2010 +0800

    ocfs2: Don't duplicate pages past i_size during CoW.
    
    Mainline commit f5e27b6ddfbafdd9c9c2f06bbf28af12581409bc
    
    During CoW, the pages after i_size don't contain valid data, so there's
    no need to read and duplicate them.
    
    Signed-off-by: Tao Ma <tao.ma at oracle.com>
    Signed-off-by: Joel Becker <joel.becker at oracle.com>

commit 8196b47fbf1ab2cd09e4f059f8c1eac5b4706d07
Author: Dan Carpenter <error27 at gmail.com>
Date:   Sat Jul 10 16:33:36 2010 +0200

    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 36b057ad17a76039ee6d196b2f9ea60f724f8289
Author: Tao Ma <tao.ma at oracle.com>
Date:   Fri Jul 9 14:53:12 2010 +0800

    ocfs2: Make xattr reflink work with new local alloc reservation.
    
    Mainline commit 121a39bb00b421211f4f590c440a8f636d3ae807
    
    The new reservation code in local alloc has add the limitation
    that the caller should handle the case that the local alloc
    doesn't give use enough contiguous clusters. It make the old
    xattr reflink code broken.
    
    So this patch udpate the xattr reflink code so that it can
    handle the case that local alloc give us one cluster at a time.
    
    Signed-off-by: Tao Ma <tao.ma at oracle.com>
    Signed-off-by: Joel Becker <joel.becker at oracle.com>

commit 88b33e54667d8b7095ed8c716cf016fdc43cfaa5
Author: Tao Ma <tao.ma at oracle.com>
Date:   Fri Jul 9 14:53:11 2010 +0800

    ocfs2: make xattr extension work with new local alloc reservation.
    
    Mainline commit a78f9f4668949a6588b8872f162e86685c63d023
    
    The old ocfs2_xattr_extent_allocation is too optimistic about
    the clusters we can get. So actually if the file system is
    too fragmented, ocfs2_add_clusters_in_btree will return us
    with EGAIN and we need to allocate clusters once again.
    
    So this patch change it to a while loop so that we can allocate
    clusters until we reach clusters_to_add.
    
    Signed-off-by: Tao Ma <tao.ma at oracle.com>
    Signed-off-by: Joel Becker <joel.becker at oracle.com>
    Cc: stable at kernel.org

commit ce5dbe961e62d34fb335637cd3c652a63421f755
Author: Tao Ma <tao.ma at oracle.com>
Date:   Thu Jul 8 11:11:11 2010 +0800

    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 f187faa390b1d6d82d5b90a25718beda17ad8514
Author: Wengang Wang <wen.gang.wang at oracle.com>
Date:   Wed Jun 30 20:23:30 2010 +0800

    ocfs2/dlm: don't access beyond bitmap size
    
    Mainline commit f471c9df922a80ca9af1d9a490b4aab3f990ec19
    
    dlm->recovery_map is defined as
    	unsigned long recovery_map[BITS_TO_LONGS(O2NM_MAX_NODES)];
    
    We should treat O2NM_MAX_NODES as the bit map size in bits.
    This patches fixes a bit operation that takes O2NM_MAX_NODES + 1 as bitmap size.
    
    Signed-off-by: Wengang Wang <wen.gang.wang at oracle.com>
    Signed-off-by: Joel Becker <joel.becker at oracle.com>

commit bca6ac9a8ab10f0a4aeac66dac965512d03e8e13
Author: Joel Becker <joel.becker at oracle.com>
Date:   Fri Jul 2 17:20:27 2010 -0700

    ocfs2: No need to zero pages past i_size.
    
    Mainline commit 693c241a5f6aa01417f5f4caf9f82e60e316398d
    
    When ocfs2 fills a hole, it does so by allocating clusters.  When a
    cluster is larger than the write, ocfs2 must zero the portions of the
    cluster outside of the write.  If the clustersize is smaller than a
    pagecache page, this is handled by the normal pagecache mechanisms, but
    when the clustersize is larger than a page, ocfs2's write code will zero
    the pages adjacent to the write.  This makes sure the entire cluster is
    zeroed correctly.
    
    Currently ocfs2 behaves exactly the same when writing past i_size.
    However, this means ocfs2 is writing zeroed pages for portions of a new
    cluster that are beyond i_size.  The page writeback code isn't expecting
    this.  It treats all pages past the one containing i_size as left behind
    due to a previous truncate operation.
    
    Thankfully, ocfs2 calculates the number of pages it will be working on
    up front.  The rest of the write code merely honors the original
    calculation.  We can simply trim the number of pages to only cover the
    actual file data.
    
    Signed-off-by: Joel Becker <joel.becker at oracle.com>
    Cc: stable at kernel.org

commit 4e2eee7a540591cf5434580fc111abe47fed5138
Author: Joel Becker <joel.becker at oracle.com>
Date:   Thu Jul 1 15:13:31 2010 -0700

    ocfs2: Zero the tail cluster when extending past i_size.
    
    Mainline commit 5693486bad2bc2ac585a2c24f7e2f3964b478df9
    
    ocfs2's allocation unit is the cluster.  This can be larger than a block
    or even a memory page.  This means that a file may have many blocks in
    its last extent that are beyond the block containing i_size.  There also
    may be more unwritten extents after that.
    
    When ocfs2 grows a file, it zeros the entire cluster in order to ensure
    future i_size growth will see cleared blocks.  Unfortunately,
    block_write_full_page() drops the pages past i_size.  This means that
    ocfs2 is actually leaking garbage data into the tail end of that last
    cluster.  This is a bug.
    
    We adjust ocfs2_write_begin_nolock() and ocfs2_extend_file() to detect
    when a write or truncate is past i_size.  They will use
    ocfs2_zero_extend() to ensure the data is properly zeroed.
    
    Older versions of ocfs2_zero_extend() simply zeroed every block between
    i_size and the zeroing position.  This presumes three things:
    
    1) There is allocation for all of these blocks.
    2) The extents are not unwritten.
    3) The extents are not refcounted.
    
    (1) and (2) hold true for non-sparse filesystems, which used to be the
    only users of ocfs2_zero_extend().  (3) is another bug.
    
    Since we're now using ocfs2_zero_extend() for sparse filesystems as
    well, we teach ocfs2_zero_extend() to check every extent between
    i_size and the zeroing position.  If the extent is unwritten, it is
    ignored.  If it is refcounted, it is CoWed.  Then it is zeroed.
    
    Signed-off-by: Joel Becker <joel.becker at oracle.com>
    Cc: stable at kernel.org

commit 6ded84e21bb68970f5983e1a47764f4dc4dfcc4b
Author: Joel Becker <joel.becker at oracle.com>
Date:   Tue Jul 6 14:36:06 2010 -0700

    ocfs2: When zero extending, do it by page.
    
    Mainline commit a4bfb4cf11fd2211b788af59dc8a8b4394bca227
    
    ocfs2_zero_extend() does its zeroing block by block, but it calls a
    function named ocfs2_write_zero_page().  Let's have
    ocfs2_write_zero_page() handle the page level.  From
    ocfs2_zero_extend()'s perspective, it is now page-at-a-time.
    
    Signed-off-by: Joel Becker <joel.becker at oracle.com>
    Cc: stable at kernel.org

commit 86fc3b98fca27030586e08f65a400709b8ea27d5
Author: Tejun Heo <tj at kernel.org>
Date:   Tue Mar 30 02:52:32 2010 +0900

    ocfs2: update gfp/slab.h includes
    
    Mainline commit 327f935a9ef644c0ec3d050c94bce753756d60c0
    
    Implicit slab.h inclusion via percpu.h is about to go away.  Make sure
    gfp.h or slab.h is included as necessary.
    
    Signed-off-by: Tejun Heo <tj at kernel.org>
    Cc: Stephen Rothwell <sfr at canb.auug.org.au>
    Cc: Joel Becker <joel.becker at oracle.com>
    Signed-off-by: Stephen Rothwell <sfr at canb.auug.org.au>

commit 1cbe6dbc62e199e080c9d7d8ef2e92def0627ad4
Author: Tao Ma <tao.ma at oracle.com>
Date:   Wed Jun 9 16:43:05 2010 +0800

    ocfs2: Limit default local alloc size within bitmap range.
    
    Mainline commit 1739da40543ed2129050ccfa8a076a851ab6ed00
    
    In commit 6b82021b9e91cd689fdffadbcdb9a42597bbe764, we increase
    our local alloc size and calculate how much megabytes we can
    get according to group size and volume size.
    But we also need to check the maximum bits a local alloc block
    bitmap can have. With a bs=512, cs=32K, local volume with 160G,
    it calculate 96MB while the maximum local alloc size is only
    76M. So the bitmap will overflow and corrupt the system truncate
    log file. See bug
    http://oss.oracle.com/bugzilla/show_bug.cgi?id=1262
    
    Signed-off-by: Tao Ma <tao.ma at oracle.com>
    Acked-by: Mark Fasheh <mfasheh at suse.com>
    Signed-off-by: Joel Becker <joel.becker at oracle.com>

commit b90fabd23c00313a35f27a07b083c5b1f7ed6ce8
Author: Tao Ma <tao.ma at oracle.com>
Date:   Fri May 28 14:22:59 2010 +0800

    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 66526c522ef076093d012a8c93461766fde7953d
Author: Julia Lawall <julia at diku.dk>
Date:   Wed May 26 17:58:53 2010 +0200

    fs/ocfs2/dlm: Add missing spin_unlock
    
    Mainline commit 6469272c350872980891dbe38e81c936c43f2d9b
    
    Add a spin_unlock missing on the error path.  Unlock as in the other code
    that leads to the leave label.
    
    The semantic match that finds this problem is as follows:
    (http://coccinelle.lip6.fr/)
    
    // <smpl>
    @@
    expression E1;
    @@
    
    * spin_lock(E1,...);
      <+... when != E1
      if (...) {
        ... when != E1
    *   return ...;
      }
      ...+>
    * spin_unlock(E1,...);
    // </smpl>
    
    Signed-off-by: Julia Lawall <julia at diku.dk>
    Signed-off-by: Joel Becker <joel.becker at oracle.com>

commit 547852dba31e4682105440c0aba26ad5ca35ce82
Author: Alexey Dobriyan <adobriyan at gmail.com>
Date:   Mon May 24 14:33:03 2010 -0700

    kernel-wide: replace USHORT_MAX, SHORT_MAX and SHORT_MIN with USHRT_MAX, SHRT_MAX and SHRT_MIN
    
    Mainline commit 4be929be34f9bdeffa40d815d32d7d60d2c7f03b
    
    - C99 knows about USHRT_MAX/SHRT_MAX/SHRT_MIN, not
      USHORT_MAX/SHORT_MAX/SHORT_MIN.
    
    - Make SHRT_MIN of type s16, not int, for consistency.
    
    [akpm at linux-foundation.org: fix drivers/dma/timb_dma.c]
    [akpm at linux-foundation.org: fix security/keys/keyring.c]
    Signed-off-by: Alexey Dobriyan <adobriyan at gmail.com>
    Acked-by: WANG Cong <xiyou.wangcong at gmail.com>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit bb0f9b464ef89d731e1687172248deab81b656a4
Author: Jan Kara <jack at suse.cz>
Date:   Thu May 13 22:14:53 2010 +0200

    ocfs2: Fix use after free on remount read-only
    
    Mainline commit eea7feb072f5914ecafa95b3d83be0c229244d90
    
    We also have to cancel quota syncing thread on remount read only because
    at that moment quota is being turned off. Otherwise quota syncing thread
    will try to access already freed quota structures.
    
    Signed-off-by: Jan Kara <jack at suse.cz>

commit 1c9d078264622c5ce1410e7f109a5cf612e9e5ff
Author: Dmitry Monakhov <dmonakhov at openvz.org>
Date:   Thu Mar 4 17:32:16 2010 +0300

    ocfs2: replace inode uid,gid,mode initialization with helper function
    
    Mainline commit 75fe0a2477dab30f00c228f9a4d79009d5677bde
    
    Acked-by: Joel Becker <joel.becker at oracle.com>
    Signed-off-by: Dmitry Monakhov <dmonakhov at openvz.org>
    Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>

commit 11310bb1fd7eb40d5365856c23f0ef6ccbf72af1
Author: Jan Kara <jack at suse.cz>
Date:   Thu May 13 22:14:53 2010 +0200

    ocfs2: Fix lock inversion in quotas during umount
    
    Mainline commit c06bcbfa1ed8daaeb2a262f372b411207891e229
    
    We cannot cancel delayed work from ocfs2_local_free_info because that is called
    with dqonoff_mutex held and the work it cancels requires dqonoff_mutex to
    finish. Cancel the work before acquiring dqonoff_mutex.
    
    Acked-by: Joel Becker <Joel.Becker at oracle.com>
    Signed-off-by: Jan Kara <jack at suse.cz>

commit bc314b72e30d00fb673d4bde7d679d65fcb33f48
Author: Jan Kara <jack at suse.cz>
Date:   Fri Jul 23 19:21:57 2010 +0800

    ocfs2: Fix NULL pointer deref when writing local dquot
    
    Mainline commit 741e128933448e589a85286e535078b24f4cf568
    
    commit_dqblk() can write quota info to global file. That is actually a bad
    thing to do because if we are just modifying local quota file, we are not
    prepared (do not hold proper locks, do not have transaction credits) to do
    a modification of the global quota file. So do not use commit_dqblk() and
    instead call our writing function directly.
    
    Acked-by: Joel Becker <Joel.Becker at oracle.com>
    Signed-off-by: Jan Kara <jack at suse.cz>

commit bee19d850bd92234bb76761bf6accd68b615e6b2
Author: Jan Kara <jack at suse.cz>
Date:   Tue May 11 17:04:14 2010 +0200

    ocfs2: Fix estimate of credits needed for quota allocation
    
    Mainline commit 832d09cf1438bd172f69478bde74f20f05ec0115
    
    We were missing reservation of a journal credit for modification of quota
    file inode when creating new dquot structure in the global quota file.
    
    Acked-by: Joel Becker <Joel.Becker at oracle.com>
    Signed-off-by: Jan Kara <jack at suse.cz>

commit 3b068eded38766caab676627b1cd0411be0bea84
Author: Jan Kara <jack at suse.cz>
Date:   Wed Mar 31 16:25:37 2010 +0200

    ocfs2: Fix quota locking
    
    Mainline commit fb8dd8d780140a3f0e9074831a59054fec6cc451
    
    OCFS2 had three issues with quota locking:
    a) When reading dquot from global quota file, we started a transaction while
       holding dqio_mutex which is prone to deadlocks because other paths do it
       the other way around
    b) During ocfs2_sync_dquot we were not protected against concurrent writers
       on the same node. Because we first copy data to local buffer, a race
       could happen resulting in old data being written to global quota file and
       thus causing quota inconsistency after a crash.
    c) ip_alloc_sem of quota files was acquired while a transaction is started
       in ocfs2_quota_write which can deadlock because we first get ip_alloc_sem
       and then start a transaction when extending quota files.
    
    We fix the problem a) by pulling all necessary code to ocfs2_acquire_dquot
    and ocfs2_release_dquot. Thus we no longer depend on generic dquot_acquire
    to do the locking and can force proper lock ordering.
    
    Problems b) and c) are fixed by locking i_mutex and ip_alloc_sem of
    global quota file in ocfs2_lock_global_qf and removing ip_alloc_sem from
    ocfs2_quota_read and ocfs2_quota_write.
    
    Acked-by: Joel Becker <Joel.Becker at oracle.com>
    Signed-off-by: Jan Kara <jack at suse.cz>

commit 65dcce84b45acf9f8c33e386974640b775e98864
Author: Jan Kara <jack at suse.cz>
Date:   Wed Apr 28 19:04:29 2010 +0200

    ocfs2: Avoid unnecessary block mapping when refreshing quota info
    
    Mainline commit ae4f6ef13417deaa49471c0e903914a3ef3be258
    
    The position of global quota file info does not change. So we do not have
    to do logical -> physical block translation every time we reread it from
    disk. Thus we can also avoid taking ip_alloc_sem.
    
    Acked-by: Joel Becker <Joel.Becker at oracle.com>
    Signed-off-by: Jan Kara <jack at suse.cz>

commit f3389819840e8a426f16028f22a91e288816d9a3
Author: Jan Kara <jack at suse.cz>
Date:   Wed Apr 28 00:22:30 2010 +0200

    ocfs2: Do not map blocks from local quota file on each write
    
    Mainline commit f64dd44eb748438783b10b3f7a4968d2656a3c95
    
    There is no need to map offset of local dquot structure to on disk block
    in each quota write. It is enough to map it just once and store the physical
    block number in quota structure in memory. Moreover this simplifies locking
    as we do not have to take ip_alloc_sem from quota write path.
    
    Acked-by: Joel Becker <Joel.Becker at oracle.com>
    Signed-off-by: Jan Kara <jack at suse.cz>

commit 24c17a7947dd522074398fe6d972575145bb28c2
Author: Tristan Ye <tristan.ye at oracle.com>
Date:   Mon Jul 26 18:45:53 2010 +0800

    Ocfs2-1.8: Handle new USHRT_MAX from mainline.
    
    Mainline commit '4be929be34f9bdeffa40d815d32d7d60d2c7f03b' replace
    USHORT_MAX, SHORT_MAX and SHORT_MIN with USHRT_MAX, SHRT_MAX and SHRT_MIN
    in kernel-wide, we therefore have it included in kapi-compat.
    
    Signed-off-by: Tristan Ye <tristan.ye at oracle.com>

commit 640eae1796d7b84c91d1da3cbcb4e9170c934231
Author: Tristan Ye <tristan.ye at oracle.com>
Date:   Sat Jul 24 02:44:18 2010 +0800

    Ocfs2-1.8: Handle new helper inode_init_owner from mainline.
    
    Mainline commit 75fe0a2477dab30f00c228f9a4d79009d5677bde introduced helper
    inode_init_owner().
    
    Signed-off-by: Tristan Ye <tristan.ye at oracle.com>

commit ae1e675f79318cec23f1caf02e55c088794c1df3
Author: Tristan Ye <tristan.ye at oracle.com>
Date:   Mon Aug 2 18:18:56 2010 +0800

    Ocfs2-1.8: Make rhel spec file be aware of dlmfs.
    
    Signed-off-by: Tristan Ye <tristan.ye at oracle.com>

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

Summary of changes:
 Makefile                               |    4 +-
 configure.in                           |   10 +
 fs/ocfs2/aops.c                        |   94 +++++-----
 fs/ocfs2/blockcheck.c                  |    4 +-
 fs/ocfs2/dlm/dlmdomain.c               |    3 +-
 fs/ocfs2/dlm/dlmmaster.c               |   22 ++-
 fs/ocfs2/dlm/dlmrecovery.c             |    2 +-
 fs/ocfs2/dlmglue.c                     |    3 +-
 fs/ocfs2/file.c                        |  309 ++++++++++++++++++++++------
 fs/ocfs2/file.h                        |    6 +-
 fs/ocfs2/journal.c                     |    6 +-
 fs/ocfs2/localalloc.c                  |    7 +
 fs/ocfs2/namei.c                       |    9 +-
 fs/ocfs2/quota.h                       |   12 +-
 fs/ocfs2/quota_global.c                |  347 +++++++++++++++++++-------------
 fs/ocfs2/quota_local.c                 |  137 ++++++-------
 fs/ocfs2/refcounttree.c                |   12 +
 fs/ocfs2/reservations.c                |    1 -
 fs/ocfs2/suballoc.c                    |    2 +-
 fs/ocfs2/super.c                       |   12 +-
 fs/ocfs2/xattr.c                       |  200 +++++++++++++------
 kapi-compat/include/inode_init_owner.h |   20 ++
 kapi-compat/include/kernel_shorts.h    |    8 +
 vendor/rhel6/ocfs2.spec-generic.in     |    4 +-
 24 files changed, 811 insertions(+), 423 deletions(-)
 create mode 100644 kapi-compat/include/inode_init_owner.h
 create mode 100644 kapi-compat/include/kernel_shorts.h


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



More information about the Ocfs2-commits mailing list