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, for-linus has been updated
88e8837 Merge branch 'delayed-logging-for-2.6.35' into for-linus
ccf7c23 xfs: Ensure inode allocation buffers are fully replayed
df80615 xfs: enable background pushing of the CIL
9da1ab1 xfs: forced unmounts need to push the CIL
71e330b xfs: Introduce delayed logging core code
ed3b4d6 xfs: Improve scalability of busy extent tracking
955833c xfs: make the log ticket ID available outside the log infrastructure
169a7b0 xfs: clean up log ticket overrun debug output
c115541 xfs: Clean up XFS_BLI_* flag namespace
64fc35d xfs: modify buffer item reference counting
3383ca5 xfs: allow log ticket allocation to take allocation flags
524ee36 xfs: Don't reuse the same transaction ID for duplicated transactions.
e8bebe2 Merge branch 'for-linus' of
git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6
46e5876 xfs: constify xattr_handler
ee9a360 Merge branch 'master' into for-2.6.35
c472b43 quota: unify ->set_dqblk
b9b2dd3 quota: unify ->get_dqblk
7407cf3 Merge branch 'master' into for-2.6.35
fbd9b09 blkdev: generalize flags for blkdev_issue_fn functions
from e9cee8e6549b669080e9a7d02b8387086a5c911d (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 88e88374ee4958786397a57f684de6f1fc5e0242
Merge: 7e125f7b9cbfce4101191b8076d606c517a73066
ccf7c23fc129e75ef60e6f59f60a485b7a056598
Author: Alex Elder <aelder@xxxxxxx>
Date: Mon May 24 11:57:36 2010 -0500
Merge branch 'delayed-logging-for-2.6.35' into for-linus
commit e8bebe2f71d26871b0970ae1d9cf0ed3cdd9569d
Merge: 6109e2ce2600e2db26cd0424bb9c6ed019723288
82f3952c02add60b15eea9151d4d99b6b82066c6
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Fri May 21 19:37:45 2010 -0700
Merge branch 'for-linus' of
git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6
* 'for-linus' of
git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6: (69 commits)
fix handling of offsets in cris eeprom.c, get rid of fake on-stack files
get rid of home-grown mutex in cris eeprom.c
switch ecryptfs_write() to struct inode *, kill on-stack fake files
switch ecryptfs_get_locked_page() to struct inode *
simplify access to ecryptfs inodes in ->readpage() and friends
AFS: Don't put struct file on the stack
Ban ecryptfs over ecryptfs
logfs: replace inode uid,gid,mode initialization with helper function
ufs: replace inode uid,gid,mode initialization with helper function
udf: replace inode uid,gid,mode init with helper
ubifs: replace inode uid,gid,mode initialization with helper function
sysv: replace inode uid,gid,mode initialization with helper function
reiserfs: replace inode uid,gid,mode initialization with helper function
ramfs: replace inode uid,gid,mode initialization with helper function
omfs: replace inode uid,gid,mode initialization with helper function
bfs: replace inode uid,gid,mode initialization with helper function
ocfs2: replace inode uid,gid,mode initialization with helper function
nilfs2: replace inode uid,gid,mode initialization with helper function
minix: replace inode uid,gid,mode init with helper
ext4: replace inode uid,gid,mode init with helper
...
Trivial conflict in fs/fs-writeback.c (mark bitfields unsigned)
commit 46e58764f0c502847ed1f4662aa37eefa602a8f9
Author: Stephen Hemminger <shemminger@xxxxxxxxxx>
Date: Thu May 13 17:53:20 2010 -0700
xfs: constify xattr_handler
Signed-off-by: Stephen Hemminger <shemminger@xxxxxxxxxx>
Signed-off-by: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
commit ee9a3607fb03e804ddf624544105f4e34260c380
Merge: b492e95be0ae672922f4734acf3f5d35c30be948
d515e86e639890b33a09390d062b0831664f04a2
Author: Jens Axboe <jens.axboe@xxxxxxxxxx>
Date: Fri May 21 21:27:26 2010 +0200
Merge branch 'master' into for-2.6.35
Conflicts:
fs/ext3/fsync.c
Signed-off-by: Jens Axboe <jens.axboe@xxxxxxxxxx>
commit c472b43275976512e4c1c32da5ced03f339cb380
Author: Christoph Hellwig <hch@xxxxxxxxxxxxx>
Date: Thu May 6 17:05:17 2010 -0400
quota: unify ->set_dqblk
Pass the larger struct fs_disk_quota to the ->set_dqblk operation so
that the Q_SETQUOTA and Q_XSETQUOTA operations can be implemented
with a single filesystem operation and we can retire the ->set_xquota
operation. The additional information (RT-subvolume accounting and
warn counts) are left zero for the VFS quota implementation.
Add new fieldmask values for setting the numer of blocks and inodes
values which is required for the VFS quota, but wasn't for XFS.
Signed-off-by: Christoph Hellwig <hch@xxxxxx>
Signed-off-by: Jan Kara <jack@xxxxxxx>
commit b9b2dd36c1bc64430f8e13990ab135cbecc10076
Author: Christoph Hellwig <hch@xxxxxxxxxxxxx>
Date: Thu May 6 17:04:58 2010 -0400
quota: unify ->get_dqblk
Pass the larger struct fs_disk_quota to the ->get_dqblk operation so
that the Q_GETQUOTA and Q_XGETQUOTA operations can be implemented
with a single filesystem operation and we can retire the ->get_xquota
operation. The additional information (RT-subvolume accounting and
warn counts) are left zero for the VFS quota implementation.
Signed-off-by: Christoph Hellwig <hch@xxxxxx>
Signed-off-by: Jan Kara <jack@xxxxxxx>
commit 7407cf355fdf5500430be966dbbde84a27293bad
Merge: 6a47dc1418682c83d603b491df1d048f73aa973e
79dba2eaa771c3173957eccfd288e0e0d12e4d3f
Author: Jens Axboe <jens.axboe@xxxxxxxxxx>
Date: Thu Apr 29 09:36:24 2010 +0200
Merge branch 'master' into for-2.6.35
Conflicts:
fs/block_dev.c
Signed-off-by: Jens Axboe <jens.axboe@xxxxxxxxxx>
commit fbd9b09a177a481eda256447c881f014f29034fe
Author: Dmitry Monakhov <dmonakhov@xxxxxxxxxx>
Date: Wed Apr 28 17:55:06 2010 +0400
blkdev: generalize flags for blkdev_issue_fn functions
The patch just convert all blkdev_issue_xxx function to common
set of flags. Wait/allocation semantics preserved.
Signed-off-by: Dmitry Monakhov <dmonakhov@xxxxxxxxxx>
Signed-off-by: Jens Axboe <jens.axboe@xxxxxxxxxx>
-----------------------------------------------------------------------
Summary of changes:
fs/xfs/Makefile | 1 +
fs/xfs/linux-2.6/xfs_acl.c | 4 +-
fs/xfs/linux-2.6/xfs_buf.c | 9 +
fs/xfs/linux-2.6/xfs_quotaops.c | 9 +-
fs/xfs/linux-2.6/xfs_super.c | 15 +-
fs/xfs/linux-2.6/xfs_super.h | 2 +-
fs/xfs/linux-2.6/xfs_trace.h | 83 +++--
fs/xfs/linux-2.6/xfs_xattr.c | 8 +-
fs/xfs/quota/xfs_dquot.c | 6 +-
fs/xfs/quota/xfs_qm_syscalls.c | 10 +-
fs/xfs/xfs_acl.h | 4 +-
fs/xfs/xfs_ag.h | 24 +-
fs/xfs/xfs_alloc.c | 357 ++++++++++++++------
fs/xfs/xfs_alloc.h | 7 +-
fs/xfs/xfs_alloc_btree.c | 2 +-
fs/xfs/xfs_buf_item.c | 166 +++++-----
fs/xfs/xfs_buf_item.h | 18 +-
fs/xfs/xfs_error.c | 2 +-
fs/xfs/xfs_log.c | 120 +++++--
fs/xfs/xfs_log.h | 14 +-
fs/xfs/xfs_log_cil.c | 725 +++++++++++++++++++++++++++++++++++++++
fs/xfs/xfs_log_priv.h | 118 ++++++-
fs/xfs/xfs_log_recover.c | 46 ++--
fs/xfs/xfs_log_recover.h | 2 +-
fs/xfs/xfs_mount.h | 1 +
fs/xfs/xfs_trans.c | 144 ++++++--
fs/xfs/xfs_trans.h | 44 +--
fs/xfs/xfs_trans_buf.c | 46 ++--
fs/xfs/xfs_trans_item.c | 114 +------
fs/xfs/xfs_trans_priv.h | 15 +-
fs/xfs/xfs_types.h | 2 +
31 files changed, 1588 insertions(+), 530 deletions(-)
create mode 100644 fs/xfs/xfs_log_cil.c
hooks/post-receive
--
XFS development tree
|