Skip to contentSkip to conversation

Fix xfs build when CONFIG_XFS_POSIX_ACL=n

PATCH In review Luck, Tony 4 participants 6 messages Jul 15, 2010 – Jul 28, 2010

Subsystems (2)
Linux-next tree XFS filesystem
lore
Share & tools
lore

Luck, Tony

author
#0 lore raw

PATCH 1/1 Fix xfs build when CONFIG_XFS_POSIX_ACL=n

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 <[email protected]>

---

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

fs/xfs/linux-2.6/xfs_trace.h +2 -0
index 76de133..bb4803c 100644
@@ -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);
Acked-by on v1 1/1
#2 lore raw
In reply to Luck, Tony
Quoted 7 lines · Tony

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 <[email protected]>
Acked-by Randy Dunlap <[email protected]>

Thanks, Tony.

Quoted 21 lines

---

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

fs/xfs/linux-2.6/xfs_trace.h +2 -1
index 76de133..bb4803c 100644
@@ -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);
--
Acked-by on v1 1/1
#3 lore raw
In reply to Luck, Tony
Quoted 7 lines · Tony

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 <[email protected]>
Acked-by Randy Dunlap <[email protected]>

Alex, can we get this merged for linux-next, please?
This problem causes lots of xfs build errors in linux-next without this patch.

Quoted 21 lines

---

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

fs/xfs/linux-2.6/xfs_trace.h +2 -1
index 76de133..bb4803c 100644
@@ -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);
--
Quoted 3 lines

To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

---
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***

#4 lore raw
Quoted 6 lines · Randy Dunlap
Quoted 4 lines · Tony

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.

Quoted 8 lines
Quoted 3 lines

Only define the tracepoint when the function exists.

Signed-off-by Tony Luck <[email protected]>
Acked-by Randy Dunlap <[email protected]>

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

#5 lore raw
Quoted 9 lines · Alex Elder
Quoted 8 lines · Randy Dunlap
Quoted 6 lines · Tony

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.

Quoted 8 lines
Quoted 6 lines
Quoted 1 line
Signed-off-by Tony Luck <[email protected]>
Acked-by Randy Dunlap <[email protected]>

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.

Signature · 2 lines
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***