From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Luck, Tony" Subject: [PATCH] Fix xfs build when CONFIG_XFS_POSIX_ACL=n Date: Thu, 15 Jul 2010 10:18:07 -0700 Message-ID: <4c3f42cf1240489af5@agluck-desktop.sc.intel.com> Return-path: Received: from mga03.intel.com ([143.182.124.21]:58882 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933808Ab0GORSJ (ORCPT ); Thu, 15 Jul 2010 13:18:09 -0400 Sender: linux-next-owner@vger.kernel.org List-ID: To: Alex Elder Cc: xfs-masters@oss.sgi.com, linux-next@vger.kernel.org, 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 --- 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);