* [GIT PULL] XFS update for 2.6.33-rc1
@ 2009-12-10 22:19 Alex Elder
2009-12-11 6:30 ` Linus Torvalds
0 siblings, 1 reply; 10+ messages in thread
From: Alex Elder @ 2009-12-10 22:19 UTC (permalink / raw)
To: torvalds; +Cc: akpm, linux-kernel, xfs
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(-)
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [GIT PULL] XFS update for 2.6.33-rc1
2009-12-10 22:19 Alex Elder
@ 2009-12-11 6:30 ` Linus Torvalds
0 siblings, 0 replies; 10+ messages in thread
From: Linus Torvalds @ 2009-12-11 6:30 UTC (permalink / raw)
To: Alex Elder; +Cc: akpm, linux-kernel, xfs
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
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
^ permalink raw reply [flat|nested] 10+ messages in thread
* [GIT PULL] XFS update for 2.6.33-rc1
@ 2009-12-15 15:01 Alex Elder
0 siblings, 0 replies; 10+ messages in thread
From: Alex Elder @ 2009-12-15 15:01 UTC (permalink / raw)
To: torvalds; +Cc: akpm, linux-kernel, xfs
This is a rather pervasive change to XFS code that switches it from
using its own internal tracing mechanism to instead use the tracepoint
support provided elsewhere in the kernel.
Please pull this in for 2.6.33.
I have a few other much smaller XFS changes for 2.6.33 but wanted to
get past this hump first.
-Alex
The following changes since commit 3ea6b3d0e6d0ffd91c0f8cadeb69b7133c038b32:
Linus Torvalds (1):
Merge branch 'for_linus' of git://git.kernel.org/.../jack/linux-udf-2.6
are available in the git repository at:
git://oss.sgi.com/xfs/xfs for-linus
Christoph Hellwig (3):
xfs: cleanup bmap extent state macros
xfs: change the xfs_iext_insert / xfs_iext_remove
xfs: event tracing support
fs/xfs/Makefile | 8 +-
fs/xfs/linux-2.6/xfs_acl.c | 1 +
fs/xfs/linux-2.6/xfs_aops.c | 52 +--
fs/xfs/linux-2.6/xfs_aops.h | 2 +
fs/xfs/linux-2.6/xfs_buf.c | 117 ++---
fs/xfs/linux-2.6/xfs_buf.h | 33 +-
fs/xfs/linux-2.6/xfs_fs_subr.c | 3 +
fs/xfs/linux-2.6/xfs_ioctl.c | 1 +
fs/xfs/linux-2.6/xfs_ioctl32.c | 1 +
fs/xfs/linux-2.6/xfs_iops.c | 1 +
fs/xfs/linux-2.6/xfs_linux.h | 1 -
fs/xfs/linux-2.6/xfs_lrw.c | 87 +---
fs/xfs/linux-2.6/xfs_lrw.h | 45 --
fs/xfs/linux-2.6/xfs_super.c | 104 +---
fs/xfs/linux-2.6/xfs_super.h | 7 -
fs/xfs/linux-2.6/xfs_sync.c | 1 +
fs/xfs/linux-2.6/xfs_trace.c | 75 +++
fs/xfs/linux-2.6/xfs_trace.h | 1369 ++++++++++++++++++++++++++++++++++++++++
fs/xfs/linux-2.6/xfs_vnode.h | 4 +
fs/xfs/quota/xfs_dquot.c | 110 +---
fs/xfs/quota/xfs_dquot.h | 21 -
fs/xfs/quota/xfs_qm.c | 40 +-
fs/xfs/quota/xfs_qm_syscalls.c | 4 +-
fs/xfs/support/ktrace.c | 323 ----------
fs/xfs/support/ktrace.h | 85 ---
fs/xfs/xfs.h | 16 -
fs/xfs/xfs_ag.h | 14 +
fs/xfs/xfs_alloc.c | 230 ++------
fs/xfs/xfs_alloc.h | 27 +-
fs/xfs/xfs_alloc_btree.c | 1 +
fs/xfs/xfs_attr.c | 107 +---
fs/xfs/xfs_attr.h | 10 +
fs/xfs/xfs_attr_leaf.c | 14 +-
fs/xfs/xfs_attr_sf.h | 40 --
fs/xfs/xfs_bmap.c | 942 +++++++++-------------------
fs/xfs/xfs_bmap.h | 58 ++-
fs/xfs/xfs_bmap_btree.c | 6 -
fs/xfs/xfs_btree.c | 5 +-
fs/xfs/xfs_btree_trace.h | 17 -
fs/xfs/xfs_buf_item.c | 87 +--
fs/xfs/xfs_buf_item.h | 20 +-
fs/xfs/xfs_da_btree.c | 3 +-
fs/xfs/xfs_da_btree.h | 7 +
fs/xfs/xfs_dfrag.c | 2 +-
fs/xfs/xfs_dir2.c | 8 +-
fs/xfs/xfs_dir2_block.c | 20 +-
fs/xfs/xfs_dir2_leaf.c | 21 +-
fs/xfs/xfs_dir2_node.c | 27 +-
fs/xfs/xfs_dir2_sf.c | 26 +-
fs/xfs/xfs_dir2_trace.c | 216 -------
fs/xfs/xfs_dir2_trace.h | 72 ---
fs/xfs/xfs_filestream.c | 8 +-
fs/xfs/xfs_fsops.c | 2 +
fs/xfs/xfs_iget.c | 111 +---
fs/xfs/xfs_inode.c | 79 +--
fs/xfs/xfs_inode.h | 82 +--
fs/xfs/xfs_inode_item.c | 5 +-
fs/xfs/xfs_iomap.c | 85 +---
fs/xfs/xfs_iomap.h | 8 +
fs/xfs/xfs_log.c | 181 ++----
fs/xfs/xfs_log_priv.h | 20 +-
fs/xfs/xfs_log_recover.c | 1 +
fs/xfs/xfs_mount.c | 2 +
fs/xfs/xfs_quota.h | 8 +
fs/xfs/xfs_rename.c | 1 +
fs/xfs/xfs_rtalloc.c | 1 +
fs/xfs/xfs_rw.c | 3 +-
fs/xfs/xfs_trans.h | 47 ++
fs/xfs/xfs_trans_buf.c | 62 +-
fs/xfs/xfs_vnodeops.c | 8 +-
70 files changed, 2369 insertions(+), 2836 deletions(-)
create mode 100644 fs/xfs/linux-2.6/xfs_trace.c
create mode 100644 fs/xfs/linux-2.6/xfs_trace.h
delete mode 100644 fs/xfs/support/ktrace.c
delete mode 100644 fs/xfs/support/ktrace.h
delete mode 100644 fs/xfs/xfs_dir2_trace.c
delete mode 100644 fs/xfs/xfs_dir2_trace.h
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
^ permalink raw reply [flat|nested] 10+ messages in thread
* [GIT PULL] XFS update for 2.6.33-rc1
@ 2009-12-16 21:26 Alex Elder
2009-12-16 21:55 ` Randy Dunlap
0 siblings, 1 reply; 10+ messages in thread
From: Alex Elder @ 2009-12-16 21:26 UTC (permalink / raw)
To: torvalds; +Cc: akpm, linux-kernel, xfs
One more XFS update for -rc1, now that the new XFS tracing code has
been committed.
-Alex
The following changes since commit 5ac4d630eb87656bd4dc313b910776d54d88ea28:
Linus Torvalds (1):
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
are available in the git repository at:
git://oss.sgi.com/xfs/xfs for-linus
Christoph Hellwig (2):
xfs: check for not fully initialized inodes in xfs_ireclaim
xfs: kill xfs_bmbt_rec_32/64 types
Dave Chinner (2):
xfs: improve metadata I/O merging in the elevator
XFS: Free buffer pages array unconditionally
fs/xfs/linux-2.6/xfs_buf.c | 10 +++++++---
fs/xfs/linux-2.6/xfs_buf.h | 1 +
fs/xfs/xfs_bmap_btree.h | 14 +++-----------
fs/xfs/xfs_iget.c | 12 ++++++++----
fs/xfs/xfs_inode_item.h | 6 +++---
fs/xfs/xfs_log.c | 2 ++
include/linux/fs.h | 1 +
7 files changed, 25 insertions(+), 21 deletions(-)
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [GIT PULL] XFS update for 2.6.33-rc1
2009-12-16 21:26 [GIT PULL] XFS update for 2.6.33-rc1 Alex Elder
@ 2009-12-16 21:55 ` Randy Dunlap
2009-12-17 0:20 ` Dave Chinner
0 siblings, 1 reply; 10+ messages in thread
From: Randy Dunlap @ 2009-12-16 21:55 UTC (permalink / raw)
To: Alex Elder; +Cc: akpm, torvalds, linux-kernel, xfs
On Wed, 16 Dec 2009 15:26:10 -0600 Alex Elder wrote:
> One more XFS update for -rc1, now that the new XFS tracing code has
> been committed.
Sorry if I have missed it, but have the printk format warnings
on i386 builds been fixed?
e.g.:
In file included from linux-next-20091216/include/trace/ftrace.h:398,
from linux-next-20091216/include/trace/define_trace.h:69,
from linux-next-20091216/fs/xfs/linux-2.6/xfs_trace.h:1369,
from linux-next-20091216/fs/xfs/linux-2.6/xfs_trace.c:75:
linux-next-20091216/fs/xfs/linux-2.6/./xfs_trace.h: In function 'ftrace_raw_output_id_xfs_iomap_enter':
linux-next-20091216/fs/xfs/linux-2.6/./xfs_trace.h:830: warning: format '%llx' expects type 'long long unsigned int', but argument 12 has type 'xfs_fsblock_t'
linux-next-20091216/fs/xfs/linux-2.6/./xfs_trace.h: In function 'ftrace_raw_output_id_xfs_iomap_found':
linux-next-20091216/fs/xfs/linux-2.6/./xfs_trace.h:831: warning: format '%llx' expects type 'long long unsigned int', but argument 12 has type 'xfs_fsblock_t'
linux-next-20091216/fs/xfs/linux-2.6/./xfs_trace.h: In function 'ftrace_raw_output_id_xfs_iomap_alloc':
linux-next-20091216/fs/xfs/linux-2.6/./xfs_trace.h:832: warning: format '%llx' expects type 'long long unsigned int', but argument 12 has type 'xfs_fsblock_t'
LD drivers/media/IR/ir-common.o
linux-next-20091216/fs/xfs/linux-2.6/./xfs_trace.h: In function 'ftrace_raw_output_id_xfs_alloc_exact_done':
linux-next-20091216/fs/xfs/linux-2.6/./xfs_trace.h:1226: warning: format '%llx' expects type 'long long unsigned int', but argument 22 has type 'xfs_fsblock_t'
linux-next-20091216/fs/xfs/linux-2.6/./xfs_trace.h: In function 'ftrace_raw_output_id_xfs_alloc_exact_error':
linux-next-20091216/fs/xfs/linux-2.6/./xfs_trace.h:1227: warning: format '%llx' expects type 'long long unsigned int', but argument 22 has type 'xfs_fsblock_t'
linux-next-20091216/fs/xfs/linux-2.6/./xfs_trace.h: In function 'ftrace_raw_output_id_xfs_alloc_near_nominleft':
linux-next-20091216/fs/xfs/linux-2.6/./xfs_trace.h:1228: warning: format '%llx' expects type 'long long unsigned int', but argument 22 has type 'xfs_fsblock_t'
linux-next-20091216/fs/xfs/linux-2.6/./xfs_trace.h: In function 'ftrace_raw_output_id_xfs_alloc_near_first': LD drivers/media/IR/built-in.o
linux-next-20091216/fs/xfs/linux-2.6/./xfs_trace.h:1229: warning: format '%llx' expects type 'long long unsigned int', but argument 22 has type 'xfs_fsblock_t'
linux-next-20091216/fs/xfs/linux-2.6/./xfs_trace.h: In function 'ftrace_raw_output_id_xfs_alloc_near_greater':
linux-next-20091216/fs/xfs/linux-2.6/./xfs_trace.h:1230: warning: format '%llx' expects type 'long long unsigned int', but argument 22 has type 'xfs_fsblock_t'
linux-next-20091216/fs/xfs/linux-2.6/./xfs_trace.h: In function 'ftrace_raw_output_id_xfs_alloc_near_lesser':
linux-next-20091216/fs/xfs/linux-2.6/./xfs_trace.h:1231: warning: format '%llx' expects type 'long long unsigned int', but argument 22 has type 'xfs_fsblock_t'
linux-next-20091216/fs/xfs/linux-2.6/./xfs_trace.h: In function 'ftrace_raw_output_id_xfs_alloc_near_error':
linux-next-20091216/fs/xfs/linux-2.6/./xfs_trace.h:1232: warning: format '%llx' expects type 'long long unsigned int', but argument 22 has type 'xfs_fsblock_t'
linux-next-20091216/fs/xfs/linux-2.6/./xfs_trace.h: In function 'ftrace_raw_output_id_xfs_alloc_size_neither':
linux-next-20091216/fs/xfs/linux-2.6/./xfs_trace.h:1233: warning: format '%llx' expects type 'long long unsigned int', but argument 22 has type 'xfs_fsblock_t'
linux-next-20091216/fs/xfs/linux-2.6/./xfs_trace.h: In function 'ftrace_raw_output_id_xfs_alloc_size_noentry':
linux-next-20091216/fs/xfs/linux-2.6/./xfs_trace.h:1234: warning: format '%llx' expects type 'long long unsigned int', but argument 22 has type 'xfs_fsblock_t'
linux-next-20091216/fs/xfs/linux-2.6/./xfs_trace.h: In function 'ftrace_raw_output_id_xfs_alloc_size_nominleft':
linux-next-20091216/fs/xfs/linux-2.6/./xfs_trace.h:1235: warning: format '%llx' expects type 'long long unsigned int', but argument 22 has type 'xfs_fsblock_t'
linux-next-20091216/fs/xfs/linux-2.6/./xfs_trace.h: In function 'ftrace_raw_output_id_xfs_alloc_size_done':
linux-next-20091216/fs/xfs/linux-2.6/./xfs_trace.h:1236: warning: format '%llx' expects type 'long long unsigned int', but argument 22 has type 'xfs_fsblock_t'
linux-next-20091216/fs/xfs/linux-2.6/./xfs_trace.h: In function 'ftrace_raw_output_id_xfs_alloc_size_error':
linux-next-20091216/fs/xfs/linux-2.6/./xfs_trace.h:1237: warning: format '%llx' expects type 'long long unsigned int', but argument 22 has type 'xfs_fsblock_t'
linux-next-20091216/fs/xfs/linux-2.6/./xfs_trace.h: In function 'ftrace_raw_output_id_xfs_alloc_small_freelist':
linux-next-20091216/fs/xfs/linux-2.6/./xfs_trace.h:1238: warning: format '%llx' expects type 'long long unsigned int', but argument 22 has type 'xfs_fsblock_t'
linux-next-20091216/fs/xfs/linux-2.6/./xfs_trace.h: In function 'ftrace_raw_output_id_xfs_alloc_small_notenough':
linux-next-20091216/fs/xfs/linux-2.6/./xfs_trace.h:1239: warning: format '%llx' expects type 'long long unsigned int', but argument 22 has type 'xfs_fsblock_t'
linux-next-20091216/fs/xfs/linux-2.6/./xfs_trace.h: In function 'ftrace_raw_output_id_xfs_alloc_small_done':
linux-next-20091216/fs/xfs/linux-2.6/./xfs_trace.h:1240: warning: format '%llx' expects type 'long long unsigned int', but argument 22 has type 'xfs_fsblock_t'
linux-next-20091216/fs/xfs/linux-2.6/./xfs_trace.h: In function 'ftrace_raw_output_id_xfs_alloc_small_error':
linux-next-20091216/fs/xfs/linux-2.6/./xfs_trace.h:1241: warning: format '%llx' expects type 'long long unsigned int', but argument 22 has type 'xfs_fsblock_t'
linux-next-20091216/fs/xfs/linux-2.6/./xfs_trace.h: In function 'ftrace_raw_output_id_xfs_alloc_vextent_badargs':
linux-next-20091216/fs/xfs/linux-2.6/./xfs_trace.h:1242: warning: format '%llx' expects type 'long long unsigned int', but argument 22 has type 'xfs_fsblock_t'
linux-next-20091216/fs/xfs/linux-2.6/./xfs_trace.h: In function 'ftrace_raw_output_id_xfs_alloc_vextent_nofix':
linux-next-20091216/fs/xfs/linux-2.6/./xfs_trace.h:1243: warning: format '%llx' expects type 'long long unsigned int', but argument 22 has type 'xfs_fsblock_t'
linux-next-20091216/fs/xfs/linux-2.6/./xfs_trace.h: In function 'ftrace_raw_output_id_xfs_alloc_vextent_noagbp':
linux-next-20091216/fs/xfs/linux-2.6/./xfs_trace.h:1244: warning: format '%llx' expects type 'long long unsigned int', but argument 22 has type 'xfs_fsblock_t'
linux-next-20091216/fs/xfs/linux-2.6/./xfs_trace.h: In function 'ftrace_raw_output_id_xfs_alloc_vextent_loopfailed':
linux-next-20091216/fs/xfs/linux-2.6/./xfs_trace.h:1245: warning: format '%llx' expects type 'long long unsigned int', but argument 22 has type 'xfs_fsblock_t'
linux-next-20091216/fs/xfs/linux-2.6/./xfs_trace.h: In function 'ftrace_raw_output_id_xfs_alloc_vextent_allfailed':
linux-next-20091216/fs/xfs/linux-2.6/./xfs_trace.h:1246: warning: format '%llx' expects type 'long long unsigned int', but argument 22 has type 'xfs_fsblock_t'
> -Alex
>
> The following changes since commit 5ac4d630eb87656bd4dc313b910776d54d88ea28:
> Linus Torvalds (1):
> Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
>
> are available in the git repository at:
>
> git://oss.sgi.com/xfs/xfs for-linus
>
> Christoph Hellwig (2):
> xfs: check for not fully initialized inodes in xfs_ireclaim
> xfs: kill xfs_bmbt_rec_32/64 types
>
> Dave Chinner (2):
> xfs: improve metadata I/O merging in the elevator
> XFS: Free buffer pages array unconditionally
>
> fs/xfs/linux-2.6/xfs_buf.c | 10 +++++++---
> fs/xfs/linux-2.6/xfs_buf.h | 1 +
> fs/xfs/xfs_bmap_btree.h | 14 +++-----------
> fs/xfs/xfs_iget.c | 12 ++++++++----
> fs/xfs/xfs_inode_item.h | 6 +++---
> fs/xfs/xfs_log.c | 2 ++
> include/linux/fs.h | 1 +
> 7 files changed, 25 insertions(+), 21 deletions(-)
---
~Randy
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [GIT PULL] XFS update for 2.6.33-rc1
2009-12-16 21:55 ` Randy Dunlap
@ 2009-12-17 0:20 ` Dave Chinner
2009-12-17 1:56 ` Randy Dunlap
2009-12-17 3:41 ` Alex Elder
0 siblings, 2 replies; 10+ messages in thread
From: Dave Chinner @ 2009-12-17 0:20 UTC (permalink / raw)
To: Randy Dunlap; +Cc: akpm, xfs, torvalds, linux-kernel, Alex Elder
On Wed, Dec 16, 2009 at 01:55:12PM -0800, Randy Dunlap wrote:
> On Wed, 16 Dec 2009 15:26:10 -0600 Alex Elder wrote:
>
> > One more XFS update for -rc1, now that the new XFS tracing code has
> > been committed.
>
> Sorry if I have missed it, but have the printk format warnings
> on i386 builds been fixed?
I don't see any here w/ gcc 4.3.4 x86-64 compiling i386 kernels....
/me hates gcc's warning inconsistencies with a passion.
> e.g.:
>
> In file included from linux-next-20091216/include/trace/ftrace.h:398,
> from linux-next-20091216/include/trace/define_trace.h:69,
> from linux-next-20091216/fs/xfs/linux-2.6/xfs_trace.h:1369,
> from linux-next-20091216/fs/xfs/linux-2.6/xfs_trace.c:75:
> linux-next-20091216/fs/xfs/linux-2.6/./xfs_trace.h: In function 'ftrace_raw_output_id_xfs_iomap_enter':
> linux-next-20091216/fs/xfs/linux-2.6/./xfs_trace.h:830: warning: format '%llx' expects type 'long long unsigned int', but argument 12 has type 'xfs_fsblock_t'
Patch that should fix this below.
Cheers,
Dave.
--
Dave Chinner
david@fromorbit.com
XFS: Format xfs_fsblock_t correctly in tracing code.
Fixes printk build warnings on i386.
Reported-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>
---
fs/xfs/linux-2.6/xfs_trace.h | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/fs/xfs/linux-2.6/xfs_trace.h b/fs/xfs/linux-2.6/xfs_trace.h
index c40834b..d4ded59 100644
--- a/fs/xfs/linux-2.6/xfs_trace.h
+++ b/fs/xfs/linux-2.6/xfs_trace.h
@@ -815,7 +815,7 @@ TRACE_EVENT(name, \
), \
TP_printk("dev %d:%d ino 0x%llx size 0x%llx new_size 0x%llx " \
"offset 0x%llx count %zd flags %s " \
- "startoff 0x%llx startblock 0x%llx blockcount 0x%llx", \
+ "startoff 0x%llx startblock %s blockcount 0x%llx", \
MAJOR(__entry->dev), MINOR(__entry->dev), \
__entry->ino, \
__entry->size, \
@@ -824,7 +824,7 @@ TRACE_EVENT(name, \
__entry->count, \
__print_flags(__entry->flags, "|", BMAPI_FLAGS), \
__entry->startoff, \
- __entry->startblock, \
+ xfs_fmtfsblock(__entry->startblock), \
__entry->blockcount) \
)
DEFINE_IOMAP_EVENT(xfs_iomap_enter);
@@ -1201,7 +1201,7 @@ TRACE_EVENT(name, \
TP_printk("dev %d:%d agno %u agbno %u minlen %u maxlen %u mod %u " \
"prod %u minleft %u total %u alignment %u minalignslop %u " \
"len %u type %s otype %s wasdel %d wasfromfl %d isfl %d " \
- "userdata %d firstblock 0x%llx", \
+ "userdata %d firstblock %s", \
MAJOR(__entry->dev), MINOR(__entry->dev), \
__entry->agno, \
__entry->agbno, \
@@ -1220,7 +1220,7 @@ TRACE_EVENT(name, \
__entry->wasfromfl, \
__entry->isfl, \
__entry->userdata, \
- __entry->firstblock) \
+ xfs_fmtfsblock(__entry->firstblock)) \
)
DEFINE_ALLOC_EVENT(xfs_alloc_exact_done);
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [GIT PULL] XFS update for 2.6.33-rc1
2009-12-17 0:20 ` Dave Chinner
@ 2009-12-17 1:56 ` Randy Dunlap
2009-12-17 3:41 ` Alex Elder
1 sibling, 0 replies; 10+ messages in thread
From: Randy Dunlap @ 2009-12-17 1:56 UTC (permalink / raw)
To: Dave Chinner; +Cc: akpm, xfs, torvalds, linux-kernel, Alex Elder
Dave Chinner wrote:
> On Wed, Dec 16, 2009 at 01:55:12PM -0800, Randy Dunlap wrote:
>> On Wed, 16 Dec 2009 15:26:10 -0600 Alex Elder wrote:
>>
>>> One more XFS update for -rc1, now that the new XFS tracing code has
>>> been committed.
>> Sorry if I have missed it, but have the printk format warnings
>> on i386 builds been fixed?
>
> I don't see any here w/ gcc 4.3.4 x86-64 compiling i386 kernels....
>
> /me hates gcc's warning inconsistencies with a passion.
>
>> e.g.:
>>
>> In file included from linux-next-20091216/include/trace/ftrace.h:398,
>> from linux-next-20091216/include/trace/define_trace.h:69,
>> from linux-next-20091216/fs/xfs/linux-2.6/xfs_trace.h:1369,
>> from linux-next-20091216/fs/xfs/linux-2.6/xfs_trace.c:75:
>> linux-next-20091216/fs/xfs/linux-2.6/./xfs_trace.h: In function 'ftrace_raw_output_id_xfs_iomap_enter':
>> linux-next-20091216/fs/xfs/linux-2.6/./xfs_trace.h:830: warning: format '%llx' expects type 'long long unsigned int', but argument 12 has type 'xfs_fsblock_t'
>
> Patch that should fix this below.
Yes, thanks for that.
Acked-by: Randy Dunlap <randy.dunlap@oracle.com>
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
^ permalink raw reply [flat|nested] 10+ messages in thread
* RE: [GIT PULL] XFS update for 2.6.33-rc1
2009-12-17 0:20 ` Dave Chinner
2009-12-17 1:56 ` Randy Dunlap
@ 2009-12-17 3:41 ` Alex Elder
2010-01-08 17:44 ` Randy Dunlap
1 sibling, 1 reply; 10+ messages in thread
From: Alex Elder @ 2009-12-17 3:41 UTC (permalink / raw)
To: Dave Chinner, Randy Dunlap; +Cc: akpm, torvalds, linux-kernel, xfs
Dave Chinner wrote:
> On Wed, Dec 16, 2009 at 01:55:12PM -0800, Randy Dunlap wrote:
>> On Wed, 16 Dec 2009 15:26:10 -0600 Alex Elder wrote:
>>
>>> One more XFS update for -rc1, now that the new XFS tracing code has
>>> been committed.
>>
>> Sorry if I have missed it, but have the printk format warnings
>> on i386 builds been fixed?
>
> I don't see any here w/ gcc 4.3.4 x86-64 compiling i386 kernels....
I didn't get them either when I built in my environment.
Dave, your patch looks good to me, and Randy has acked it
so I'm going to pull it into our XFS top-of-tree. I'll
hold off sending yet another pull request to Linus for
now. Thanks for addressing it quickly.
-Alex
> /me hates gcc's warning inconsistencies with a passion.
>
>> e.g.:
>>
>> In file included from linux-next-20091216/include/trace/ftrace.h:398,
>> from linux-next-20091216/include/trace/define_trace.h:69,
>> from linux-next-20091216/fs/xfs/linux-2.6/xfs_trace.h:1369,
>> from linux-next-20091216/fs/xfs/linux-2.6/xfs_trace.c:75:
>> linux-next-20091216/fs/xfs/linux-2.6/./xfs_trace.h: In function
>> 'ftrace_raw_output_id_xfs_iomap_enter': linux-next-20091216/fs/xfs/linux-2.6/./xfs_trace.h:830:
>> warning: format '%llx' expects type 'long long unsigned int', but argument 12 has type
>> 'xfs_fsblock_t'
>
> Patch that should fix this below.
>
> Cheers,
>
> Dave.
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [GIT PULL] XFS update for 2.6.33-rc1
2009-12-17 3:41 ` Alex Elder
@ 2010-01-08 17:44 ` Randy Dunlap
2010-01-08 18:09 ` Alex Elder
0 siblings, 1 reply; 10+ messages in thread
From: Randy Dunlap @ 2010-01-08 17:44 UTC (permalink / raw)
To: Alex Elder; +Cc: torvalds, akpm, linux-kernel, xfs
On Wed, 16 Dec 2009 21:41:12 -0600 Alex Elder wrote:
> Dave Chinner wrote:
> > On Wed, Dec 16, 2009 at 01:55:12PM -0800, Randy Dunlap wrote:
> >> On Wed, 16 Dec 2009 15:26:10 -0600 Alex Elder wrote:
> >>
> >>> One more XFS update for -rc1, now that the new XFS tracing code has
> >>> been committed.
> >>
> >> Sorry if I have missed it, but have the printk format warnings
> >> on i386 builds been fixed?
> >
> > I don't see any here w/ gcc 4.3.4 x86-64 compiling i386 kernels....
>
> I didn't get them either when I built in my environment.
>
> Dave, your patch looks good to me, and Randy has acked it
> so I'm going to pull it into our XFS top-of-tree. I'll
> hold off sending yet another pull request to Linus for
> now. Thanks for addressing it quickly.
>
> -Alex
Hi Alex,
Dave's patch is now needed in Linus's mainline kernel tree...
> > /me hates gcc's warning inconsistencies with a passion.
> >
> >> e.g.:
> >>
> >> In file included from linux-next-20091216/include/trace/ftrace.h:398,
> >> from linux-next-20091216/include/trace/define_trace.h:69,
> >> from linux-next-20091216/fs/xfs/linux-2.6/xfs_trace.h:1369,
> >> from linux-next-20091216/fs/xfs/linux-2.6/xfs_trace.c:75:
> >> linux-next-20091216/fs/xfs/linux-2.6/./xfs_trace.h: In function
> >> 'ftrace_raw_output_id_xfs_iomap_enter': linux-next-20091216/fs/xfs/linux-2.6/./xfs_trace.h:830:
> >> warning: format '%llx' expects type 'long long unsigned int', but argument 12 has type
> >> 'xfs_fsblock_t'
> >
> > Patch that should fix this below.
> >
> > Cheers,
> >
> > Dave.
---
~Randy
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
^ permalink raw reply [flat|nested] 10+ messages in thread
* RE: [GIT PULL] XFS update for 2.6.33-rc1
2010-01-08 17:44 ` Randy Dunlap
@ 2010-01-08 18:09 ` Alex Elder
0 siblings, 0 replies; 10+ messages in thread
From: Alex Elder @ 2010-01-08 18:09 UTC (permalink / raw)
To: Randy Dunlap; +Cc: torvalds, akpm, linux-kernel, xfs
Randy Dunlap wrote:
> On Wed, 16 Dec 2009 21:41:12 -0600 Alex Elder wrote:
>
>> Dave Chinner wrote:
>>> On Wed, Dec 16, 2009 at 01:55:12PM -0800, Randy Dunlap wrote:
>>>> On Wed, 16 Dec 2009 15:26:10 -0600 Alex Elder wrote:
>>>>
>>>>> One more XFS update for -rc1, now that the new XFS tracing code has
>>>>> been committed.
>>>>
>>>> Sorry if I have missed it, but have the printk format warnings
>>>> on i386 builds been fixed?
>>>
>>> I don't see any here w/ gcc 4.3.4 x86-64 compiling i386 kernels....
>>
>> I didn't get them either when I built in my environment.
>>
>> Dave, your patch looks good to me, and Randy has acked it
>> so I'm going to pull it into our XFS top-of-tree. I'll
>> hold off sending yet another pull request to Linus for
>> now. Thanks for addressing it quickly.
>>
>> -Alex
>
> Hi Alex,
> Dave's patch is now needed in Linus's mainline kernel tree...
Yes, I noticed that. I forgot I hadn't requested it get pulled.
Sorry. Working on that today.
-Alex
>>> /me hates gcc's warning inconsistencies with a passion.
>>>
>>>> e.g.:
>>>>
>>>> In file included from linux-next-20091216/include/trace/ftrace.h:398,
>>>> from linux-next-20091216/include/trace/define_trace.h:69,
>>>> from linux-next-20091216/fs/xfs/linux-2.6/xfs_trace.h:1369,
>>>> from linux-next-20091216/fs/xfs/linux-2.6/xfs_trace.c:75:
>>>> linux-next-20091216/fs/xfs/linux-2.6/./xfs_trace.h: In function
>>>> 'ftrace_raw_output_id_xfs_iomap_enter':
>>>> linux-next-20091216/fs/xfs/linux-2.6/./xfs_trace.h:830: warning: format '%llx' expects type
>>>> 'long long unsigned int', but argument 12 has type 'xfs_fsblock_t'
>>>
>>> Patch that should fix this below.
>>>
>>> Cheers,
>>>
>>> Dave.
>
>
> ---
> ~Randy
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2010-01-08 18:09 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-12-16 21:26 [GIT PULL] XFS update for 2.6.33-rc1 Alex Elder
2009-12-16 21:55 ` Randy Dunlap
2009-12-17 0:20 ` Dave Chinner
2009-12-17 1:56 ` Randy Dunlap
2009-12-17 3:41 ` Alex Elder
2010-01-08 17:44 ` Randy Dunlap
2010-01-08 18:09 ` Alex Elder
-- strict thread matches above, loose matches on Subject: below --
2009-12-15 15:01 Alex Elder
2009-12-10 22:19 Alex Elder
2009-12-11 6:30 ` Linus Torvalds
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox