Hi Eric,
Today's linux-next build (powerpc ppc64_defconfig) failed like this:
fs/notify/fanotify/fanotify_user.c: In function 'create_fd':
fs/notify/fanotify/fanotify_user.c:76: error: 'IMA_COUNT_UPDATE' undeclared (first use in this function)
fs/notify/fanotify/fanotify_user.c:76: error: too many arguments to function 'ima_path_check'
Caused by commit df8f58f5e75be6fa3fb7e5bd55f3ab5b8970b16b ("fanotify:
send events using read") from the fsnotify tree interacting with commit
1429b3eca23818f87f9fa569a15d9816de81f698 ("Untangling ima mess, part 3:
kill dead code in ima") from Linus' tree.
I applied the following merge fix (I *think* it is correct but may easily
require something more - Al?) for today (and can carry it for a while):
From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Thu, 17 Dec 2009 14:40:11 +1100
Subject: [PATCH] fsnotify: fixup for ima_path_check API change
Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
---
fs/notify/fanotify/fanotify_user.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/fs/notify/fanotify/fanotify_user.c b/fs/notify/fanotify/fanotify_user.c
index 98c5c44..da79856 100644
--- a/fs/notify/fanotify/fanotify_user.c
+++ b/fs/notify/fanotify/fanotify_user.c
@@ -73,7 +73,7 @@ static int create_fd(struct fsnotify_group *group, struct fsnotify_event *event)
/* it's possible this event was an overflow event. in that case dentry and mnt
* are NULL; That's fine, just don't call dentry open */
if (dentry && mnt) {
- err = ima_path_check(&event->path, MAY_READ, IMA_COUNT_UPDATE);
+ err = ima_path_check(&event->path, MAY_READ);
if (err)
new_file = ERR_PTR(err);
else
--
1.6.5.4
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
