* [PATCH] Fix xfs build when CONFIG_XFS_POSIX_ACL=n
@ 2010-07-15 17:18 Luck, Tony
2010-07-15 18:00 ` Christoph Hellwig
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Luck, Tony @ 2010-07-15 17:18 UTC (permalink / raw)
To: Alex Elder
Cc: xfs-masters, linux-next, Christoph Hellwig, Dave Chinner, Randy Dunlap
When CONFIG_XFS_POSIX_ACL is not set "xfs_check_acl" is #defined
to NULL - which breaks the code attempting to add a tracepoint
on this function.
Only define the tracepoint when the function exists.
Signed-off-by: Tony Luck <tony.luck@intel.com>
---
Broken in linux-next for a few days by the "xfs: split xfs_itrace_entry"
commit. This patch should go after it (or better, should be merged into
it before this goes upstream).
diff --git a/fs/xfs/linux-2.6/xfs_trace.h b/fs/xfs/linux-2.6/xfs_trace.h
index 76de133..bb4803c 100644
--- a/fs/xfs/linux-2.6/xfs_trace.h
+++ b/fs/xfs/linux-2.6/xfs_trace.h
@@ -568,7 +568,9 @@ DEFINE_INODE_EVENT(xfs_readlink);
DEFINE_INODE_EVENT(xfs_alloc_file_space);
DEFINE_INODE_EVENT(xfs_free_file_space);
DEFINE_INODE_EVENT(xfs_readdir);
+#ifdef CONFIG_XFS_POSIX_ACL
DEFINE_INODE_EVENT(xfs_check_acl);
+#endif
DEFINE_INODE_EVENT(xfs_vm_bmap);
DEFINE_INODE_EVENT(xfs_file_ioctl);
DEFINE_INODE_EVENT(xfs_file_compat_ioctl);
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] Fix xfs build when CONFIG_XFS_POSIX_ACL=n
2010-07-15 17:18 [PATCH] Fix xfs build when CONFIG_XFS_POSIX_ACL=n Luck, Tony
@ 2010-07-15 18:00 ` Christoph Hellwig
2010-07-15 18:06 ` Randy Dunlap
2010-07-26 15:48 ` Randy Dunlap
2 siblings, 0 replies; 6+ messages in thread
From: Christoph Hellwig @ 2010-07-15 18:00 UTC (permalink / raw)
To: Luck, Tony
Cc: Alex Elder, xfs-masters, linux-next, Christoph Hellwig,
Dave Chinner, Randy Dunlap
On Thu, Jul 15, 2010 at 10:18:07AM -0700, Luck, Tony wrote:
> When CONFIG_XFS_POSIX_ACL is not set "xfs_check_acl" is #defined
> to NULL - which breaks the code attempting to add a tracepoint
> on this function.
>
> Only define the tracepoint when the function exists.
>
> Signed-off-by: Tony Luck <tony.luck@intel.com>
Thanks, that's much better than the stubbing changes I had prepared.
Reviewed-by: Christoph Hellwig <hch@lst.de>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] Fix xfs build when CONFIG_XFS_POSIX_ACL=n
2010-07-15 17:18 [PATCH] Fix xfs build when CONFIG_XFS_POSIX_ACL=n Luck, Tony
2010-07-15 18:00 ` Christoph Hellwig
@ 2010-07-15 18:06 ` Randy Dunlap
2010-07-26 15:48 ` Randy Dunlap
2 siblings, 0 replies; 6+ messages in thread
From: Randy Dunlap @ 2010-07-15 18:06 UTC (permalink / raw)
To: Luck, Tony
Cc: Alex Elder, xfs-masters, linux-next, Christoph Hellwig,
Dave Chinner, Randy Dunlap
Luck, Tony wrote:
> When CONFIG_XFS_POSIX_ACL is not set "xfs_check_acl" is #defined
> to NULL - which breaks the code attempting to add a tracepoint
> on this function.
>
> Only define the tracepoint when the function exists.
>
> Signed-off-by: Tony Luck <tony.luck@intel.com>
Acked-by: Randy Dunlap <randy.dunlap@oracle.com>
Thanks, Tony.
> ---
>
> Broken in linux-next for a few days by the "xfs: split xfs_itrace_entry"
> commit. This patch should go after it (or better, should be merged into
> it before this goes upstream).
>
> diff --git a/fs/xfs/linux-2.6/xfs_trace.h b/fs/xfs/linux-2.6/xfs_trace.h
> index 76de133..bb4803c 100644
> --- a/fs/xfs/linux-2.6/xfs_trace.h
> +++ b/fs/xfs/linux-2.6/xfs_trace.h
> @@ -568,7 +568,9 @@ DEFINE_INODE_EVENT(xfs_readlink);
> DEFINE_INODE_EVENT(xfs_alloc_file_space);
> DEFINE_INODE_EVENT(xfs_free_file_space);
> DEFINE_INODE_EVENT(xfs_readdir);
> +#ifdef CONFIG_XFS_POSIX_ACL
> DEFINE_INODE_EVENT(xfs_check_acl);
> +#endif
> DEFINE_INODE_EVENT(xfs_vm_bmap);
> DEFINE_INODE_EVENT(xfs_file_ioctl);
> DEFINE_INODE_EVENT(xfs_file_compat_ioctl);
> --
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] Fix xfs build when CONFIG_XFS_POSIX_ACL=n
2010-07-15 17:18 [PATCH] Fix xfs build when CONFIG_XFS_POSIX_ACL=n Luck, Tony
2010-07-15 18:00 ` Christoph Hellwig
2010-07-15 18:06 ` Randy Dunlap
@ 2010-07-26 15:48 ` Randy Dunlap
2010-07-28 14:22 ` Alex Elder
2 siblings, 1 reply; 6+ messages in thread
From: Randy Dunlap @ 2010-07-26 15:48 UTC (permalink / raw)
To: Luck, Tony
Cc: Alex Elder, xfs-masters, linux-next, Christoph Hellwig, Dave Chinner
On Thu, 15 Jul 2010 10:18:07 -0700 Luck, Tony wrote:
> When CONFIG_XFS_POSIX_ACL is not set "xfs_check_acl" is #defined
> to NULL - which breaks the code attempting to add a tracepoint
> on this function.
>
> Only define the tracepoint when the function exists.
>
> Signed-off-by: Tony Luck <tony.luck@intel.com>
Acked-by: Randy Dunlap <randy.dunlap@oracle.com>
Alex, can we get this merged for linux-next, please?
This problem causes lots of xfs build errors in linux-next without this patch.
> ---
>
> Broken in linux-next for a few days by the "xfs: split xfs_itrace_entry"
> commit. This patch should go after it (or better, should be merged into
> it before this goes upstream).
>
> diff --git a/fs/xfs/linux-2.6/xfs_trace.h b/fs/xfs/linux-2.6/xfs_trace.h
> index 76de133..bb4803c 100644
> --- a/fs/xfs/linux-2.6/xfs_trace.h
> +++ b/fs/xfs/linux-2.6/xfs_trace.h
> @@ -568,7 +568,9 @@ DEFINE_INODE_EVENT(xfs_readlink);
> DEFINE_INODE_EVENT(xfs_alloc_file_space);
> DEFINE_INODE_EVENT(xfs_free_file_space);
> DEFINE_INODE_EVENT(xfs_readdir);
> +#ifdef CONFIG_XFS_POSIX_ACL
> DEFINE_INODE_EVENT(xfs_check_acl);
> +#endif
> DEFINE_INODE_EVENT(xfs_vm_bmap);
> DEFINE_INODE_EVENT(xfs_file_ioctl);
> DEFINE_INODE_EVENT(xfs_file_compat_ioctl);
> --
> To unsubscribe from this list: send the line "unsubscribe linux-next" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
---
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] Fix xfs build when CONFIG_XFS_POSIX_ACL=n
2010-07-26 15:48 ` Randy Dunlap
@ 2010-07-28 14:22 ` Alex Elder
2010-07-28 17:25 ` Randy Dunlap
0 siblings, 1 reply; 6+ messages in thread
From: Alex Elder @ 2010-07-28 14:22 UTC (permalink / raw)
To: Randy Dunlap
Cc: Luck, Tony, xfs-masters, linux-next, Christoph Hellwig, Dave Chinner
On Mon, 2010-07-26 at 08:48 -0700, Randy Dunlap wrote:
> On Thu, 15 Jul 2010 10:18:07 -0700 Luck, Tony wrote:
>
> > When CONFIG_XFS_POSIX_ACL is not set "xfs_check_acl" is #defined
> > to NULL - which breaks the code attempting to add a tracepoint
> > on this function.
> >
> > Only define the tracepoint when the function exists.
> >
> > Signed-off-by: Tony Luck <tony.luck@intel.com>
>
> Acked-by: Randy Dunlap <randy.dunlap@oracle.com>
>
> Alex, can we get this merged for linux-next, please?
> This problem causes lots of xfs build errors in linux-next without this patch.
Confirmed fixed as of today's linux-next build. -Alex
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] Fix xfs build when CONFIG_XFS_POSIX_ACL=n
2010-07-28 14:22 ` Alex Elder
@ 2010-07-28 17:25 ` Randy Dunlap
0 siblings, 0 replies; 6+ messages in thread
From: Randy Dunlap @ 2010-07-28 17:25 UTC (permalink / raw)
To: aelder
Cc: Luck, Tony, xfs-masters, linux-next, Christoph Hellwig, Dave Chinner
On 07/28/10 07:22, Alex Elder wrote:
> On Mon, 2010-07-26 at 08:48 -0700, Randy Dunlap wrote:
>> On Thu, 15 Jul 2010 10:18:07 -0700 Luck, Tony wrote:
>>
>>> When CONFIG_XFS_POSIX_ACL is not set "xfs_check_acl" is #defined
>>> to NULL - which breaks the code attempting to add a tracepoint
>>> on this function.
>>>
>>> Only define the tracepoint when the function exists.
>>>
>>> Signed-off-by: Tony Luck <tony.luck@intel.com>
>>
>> Acked-by: Randy Dunlap <randy.dunlap@oracle.com>
>>
>> Alex, can we get this merged for linux-next, please?
>> This problem causes lots of xfs build errors in linux-next without this patch.
>
> Confirmed fixed as of today's linux-next build. -Alex
Thanks. I'm not seeing those errors today.
--
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2010-07-28 17:26 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-07-15 17:18 [PATCH] Fix xfs build when CONFIG_XFS_POSIX_ACL=n Luck, Tony
2010-07-15 18:00 ` Christoph Hellwig
2010-07-15 18:06 ` Randy Dunlap
2010-07-26 15:48 ` Randy Dunlap
2010-07-28 14:22 ` Alex Elder
2010-07-28 17:25 ` Randy Dunlap
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).