2009-12-10 22:19:33

by Alex Elder

[permalink] [raw]
Subject: [GIT PULL] XFS update for 2.6.33-rc1

The following changes since commit 22763c5cf3690a681551162c15d34d935308c8d7:
Linus Torvalds (1):
Linux 2.6.32

are available in the git repository at:

git://oss.sgi.com/xfs/xfs for-linus

Alex Elder (1):
Merge branch 'rebase_2.6.32'

Andy Poling (2):
xfs: Wrapped journal record corruption on read at recovery
xfs: Wrapped journal record corruption on read at recovery

Christoph Hellwig (26):
xfs: simplify inode teardown
xfs: fix mmap_sem/iolock inversion in xfs_free_eofblocks
xfs: I/O completion handlers must use NOFS allocations
xfs: reset the i_iolock lock class in the reclaim path
xfs: use WRITE_SYNC_PLUG for synchronous writeout
xfs: cleanup data end I/O handlers
xfs: remove IO_ISAIO
xfs: simplify xfs_buf_get / xfs_buf_read interfaces
xfs: rename xfs_attr_fetch to xfs_attr_get_int
xfs: uninline xfs_get_extsz_hint
xfs: kill the STATIC_INLINE macro
xfs: remove incorrect sparse annotation for xfs_iget_cache_miss
xfs: cleanup dmapi macros in the umount path
xfs: simplify inode teardown
xfs: fix mmap_sem/iolock inversion in xfs_free_eofblocks
xfs: I/O completion handlers must use NOFS allocations
xfs: reset the i_iolock lock class in the reclaim path
xfs: use WRITE_SYNC_PLUG for synchronous writeout
xfs: cleanup data end I/O handlers
xfs: remove IO_ISAIO
xfs: simplify xfs_buf_get / xfs_buf_read interfaces
xfs: rename xfs_attr_fetch to xfs_attr_get_int
xfs: uninline xfs_get_extsz_hint
xfs: kill the STATIC_INLINE macro
xfs: remove incorrect sparse annotation for xfs_iget_cache_miss
xfs: cleanup dmapi macros in the umount path

Eric Sandeen (1):
xfs: free temporary cursor in xfs_dialloc

Jan Rekorajski (1):
XFS bug in log recover with quota (bugzilla id 855)

Jason Gunthorpe (2):
xfs: Fix error return for fallocate() on XFS
xfs: Fix error return for fallocate() on XFS

Nathaniel W. Turner (1):
xfs: copy li_lsn before dropping AIL lock

Ryota Yamauchi (1):
xfs: fix xfs_quota remove error

fs/xfs/linux-2.6/xfs_aops.c | 114 ++++++++++++++----------------------------
fs/xfs/linux-2.6/xfs_buf.c | 14 +++---
fs/xfs/linux-2.6/xfs_buf.h | 9 +---
fs/xfs/linux-2.6/xfs_file.c | 4 +-
fs/xfs/linux-2.6/xfs_iops.c | 6 +-
fs/xfs/linux-2.6/xfs_lrw.c | 5 --
fs/xfs/linux-2.6/xfs_super.c | 71 +++++++++++++++++---------
fs/xfs/linux-2.6/xfs_sync.c | 15 ++----
fs/xfs/linux-2.6/xfs_sync.h | 1 -
fs/xfs/linux-2.6/xfs_vnode.h | 1 -
fs/xfs/support/debug.h | 18 -------
fs/xfs/xfs_attr.c | 16 ++++--
fs/xfs/xfs_attr.h | 1 -
fs/xfs/xfs_attr_leaf.c | 2 +-
fs/xfs/xfs_bmap_btree.c | 3 +-
fs/xfs/xfs_filestream.h | 8 ++--
fs/xfs/xfs_fsops.c | 25 +++++----
fs/xfs/xfs_ialloc.c | 2 +-
fs/xfs/xfs_iget.c | 5 ++-
fs/xfs/xfs_iomap.c | 9 +++-
fs/xfs/xfs_log_recover.c | 40 ++++++---------
fs/xfs/xfs_mount.c | 18 +++---
fs/xfs/xfs_mount.h | 27 ++++++++--
fs/xfs/xfs_rw.c | 30 ++++++++++--
fs/xfs/xfs_rw.h | 29 +----------
fs/xfs/xfs_trans.c | 7 ++-
fs/xfs/xfs_trans.h | 2 +-
fs/xfs/xfs_trans_buf.c | 13 ++---
fs/xfs/xfs_vnodeops.c | 79 ++++++++++-------------------
fs/xfs/xfs_vnodeops.h | 1 -
30 files changed, 254 insertions(+), 321 deletions(-)


2009-12-11 06:30:49

by Linus Torvalds

[permalink] [raw]
Subject: Re: [GIT PULL] XFS update for 2.6.33-rc1



On Thu, 10 Dec 2009, Alex Elder wrote:
>
> git://oss.sgi.com/xfs/xfs for-linus

Hmm. There seems to be a lot of duplicate commits there due to something
odd going on: rebasing _and_ then merging the rebased end result. IOW,
these are all duplicates:

xfs: cleanup data end I/O handlers
xfs: cleanup data end I/O handlers
xfs: cleanup dmapi macros in the umount path
xfs: cleanup dmapi macros in the umount path
xfs: Fix error return for fallocate() on XFS
xfs: Fix error return for fallocate() on XFS
xfs: fix mmap_sem/iolock inversion in xfs_free_eofblocks
xfs: fix mmap_sem/iolock inversion in xfs_free_eofblocks
xfs: I/O completion handlers must use NOFS allocations
xfs: I/O completion handlers must use NOFS allocations
xfs: kill the STATIC_INLINE macro
xfs: kill the STATIC_INLINE macro
xfs: remove incorrect sparse annotation for xfs_iget_cache_miss
xfs: remove incorrect sparse annotation for xfs_iget_cache_miss
xfs: remove IO_ISAIO
xfs: remove IO_ISAIO
xfs: rename xfs_attr_fetch to xfs_attr_get_int
xfs: rename xfs_attr_fetch to xfs_attr_get_int
xfs: reset the i_iolock lock class in the reclaim path
xfs: reset the i_iolock lock class in the reclaim path
xfs: simplify inode teardown
xfs: simplify inode teardown
xfs: simplify xfs_buf_get / xfs_buf_read interfaces
xfs: simplify xfs_buf_get / xfs_buf_read interfaces
xfs: uninline xfs_get_extsz_hint
xfs: uninline xfs_get_extsz_hint
xfs: use WRITE_SYNC_PLUG for synchronous writeout
xfs: use WRITE_SYNC_PLUG for synchronous writeout
xfs: Wrapped journal record corruption on read at recovery
xfs: Wrapped journal record corruption on read at recovery

What's up, doc?

Linus