Messages in this thread Patch in this message | | | Date | Wed, 19 Dec 2012 11:55:43 +1100 | From | Stephen Rothwell <> | Subject | linux-next: build failure after merge of the fsnotify tree |
| |
Hi Eric,
After merging the fsnotify tree, today's linux-next build (powerpc_ppc64_defconfig) failed like this:
fs/notify/fdinfo.c: In function 'show_fdinfo': fs/notify/fdinfo.c:30:18: error: 'struct fsnotify_group' has no member named 'mark_lock' fs/notify/fdinfo.c:36:20: error: 'struct fsnotify_group' has no member named 'mark_lock'
Caused by commit 986ab09807ca ("fsnotify: use a mutex instead of a spinlock to protect a groups mark list") interacting with commit be77196b809c ("fs, notify: add procfs fdinfo helper") from Linus' tree (via Andrew' tree).
I added the following merge fix patch:
From: Stephen Rothwell <sfr@canb.auug.org.au> Date: Wed, 19 Dec 2012 11:53:20 +1100 Subject: [PATCH] fsnotify: cope with change from spinlock to mutex
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> --- fs/notify/fdinfo.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/fs/notify/fdinfo.c b/fs/notify/fdinfo.c index 514c4b8..238a593 100644 --- a/fs/notify/fdinfo.c +++ b/fs/notify/fdinfo.c @@ -27,13 +27,13 @@ static int show_fdinfo(struct seq_file *m, struct file *f, struct fsnotify_mark *mark; int ret = 0; - spin_lock(&group->mark_lock); + mutex_lock(&group->mark_mutex); list_for_each_entry(mark, &group->marks_list, g_list) { ret = show(m, mark); if (ret) break; } - spin_unlock(&group->mark_lock); + mutex_unlock(&group->mark_mutex); return ret; } -- 1.7.10.280.gaa39 -- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ [unhandled content-type:application/pgp-signature] | |