xfs
[Top] [All Lists]

[XFS updates] XFS development tree branch, master, updated. v3.1-rc3-124

To: xfs@xxxxxxxxxxx
Subject: [XFS updates] XFS development tree branch, master, updated. v3.1-rc3-1240-g9508534
From: xfs@xxxxxxxxxxx
Date: Tue, 18 Oct 2011 14:38:41 -0500
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 "XFS development tree".

The branch, master has been updated
  9508534 Merge branch 'master' of 
git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
  0030807 xfs: revert to using a kthread for AIL pushing
  17b3847 xfs: force the log if we encounter pinned buffers in .iop_pushbuf
  bc6e588 xfs: do not update xa_last_pushed_lsn for locked items
      from  5a93a064d27b42e4af1772b0599b53e3241191ac (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 9508534c5f170ada5a745cde0df49732718440e9
Merge: 5a93a064d27b42e4af1772b0599b53e3241191ac 
a84a79e4d369a73c0130b5858199e949432da4c6
Author: Alex Elder <aelder@xxxxxxx>
Date:   Mon Oct 17 15:42:02 2011 -0500

    Merge branch 'master' of 
git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
    
    Resolved conflicts:
      fs/xfs/xfs_trans_priv.h:
        - deleted struct xfs_ail field xa_flags
        - kept field xa_log_flush in struct xfs_ail
      fs/xfs/xfs_trans_ail.c:
        - in xfsaild_push(), in XFS_ITEM_PUSHBUF case, replaced
          "flush_log = 1" with "ailp->xa_log_flush++"
    
    Signed-off-by: Alex Elder <aelder@xxxxxxx>

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

Summary of changes:
 fs/xfs/xfs_buf_item.c   |    3 +-
 fs/xfs/xfs_dquot_item.c |   10 ++++--
 fs/xfs/xfs_inode_item.c |   10 ++++--
 fs/xfs/xfs_linux.h      |    2 +
 fs/xfs/xfs_super.c      |   13 +-------
 fs/xfs/xfs_trans.h      |    2 +-
 fs/xfs/xfs_trans_ail.c  |   83 +++++++++++++++++++++++++++--------------------
 fs/xfs/xfs_trans_priv.h |    8 +----
 8 files changed, 69 insertions(+), 62 deletions(-)


hooks/post-receive
-- 
XFS development tree

<Prev in Thread] Current Thread [Next in Thread>
  • [XFS updates] XFS development tree branch, master, updated. v3.1-rc3-1240-g9508534, xfs <=