linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Randy Dunlap <randy.dunlap@oracle.com>
To: "Luck, Tony" <tony.luck@intel.com>
Cc: Alex Elder <aelder@sgi.com>,
	xfs-masters@oss.sgi.com, linux-next@vger.kernel.org,
	Christoph Hellwig <hch@lst.de>,
	Dave Chinner <dchinner@redhat.com>,
	Randy Dunlap <randy.dunlap@oracle.com>
Subject: Re: [PATCH] Fix xfs build when CONFIG_XFS_POSIX_ACL=n
Date: Thu, 15 Jul 2010 11:06:41 -0700	[thread overview]
Message-ID: <4C3F4E31.90102@oracle.com> (raw)
In-Reply-To: <4c3f42cf1240489af5@agluck-desktop.sc.intel.com>

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);
> --

  parent reply	other threads:[~2010-07-15 18:08 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
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 [this message]
2010-07-26 15:48 ` Randy Dunlap
2010-07-28 14:22   ` Alex Elder
2010-07-28 17:25     ` Randy Dunlap

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=4C3F4E31.90102@oracle.com \
    --to=randy.dunlap@oracle.com \
    --cc=aelder@sgi.com \
    --cc=dchinner@redhat.com \
    --cc=hch@lst.de \
    --cc=linux-next@vger.kernel.org \
    --cc=tony.luck@intel.com \
    --cc=xfs-masters@oss.sgi.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).