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(-)
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
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
[email protected]
XFS: Format xfs_fsblock_t correctly in tracing code.
Fixes printk build warnings on i386.
Reported-by: Randy Dunlap <[email protected]>
Signed-off-by: Dave Chinner <[email protected]>
---
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);
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 <[email protected]>
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.
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
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