linux-next: build failure after merge of the fsnotify tree

linux-next: build failure after merge of the fsnotify tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 598 bytes --]

Hi Eric,

After merging the fsnotify tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:

fs/notify/mark.c: In function 'fsnotify_add_mark':
fs/notify/mark.c:230: error: 'struct fsnotify_group' has no member named 'fanotify_data'

Caused by commit 0ed64ab6b338e4269c9f25de83781619ecd624f1 ("fsnotify:
code and error path cleanup in fsnotify_add_mark").  This build has
CONFIG_FANOTIFY not set.

I have used the fsnotify tree from next-20101109 for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]

Re: linux-next: build failure after merge of the fsnotify tree

[Eric Paris]

On Wed, 2010-11-10 at 12:53 +1100, Stephen Rothwell wrote:
> Hi Eric,
> 
> After merging the fsnotify tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
> 
> fs/notify/mark.c: In function 'fsnotify_add_mark':
> fs/notify/mark.c:230: error: 'struct fsnotify_group' has no member named 'fanotify_data'
> 
> Caused by commit 0ed64ab6b338e4269c9f25de83781619ecd624f1 ("fsnotify:
> code and error path cleanup in fsnotify_add_mark").  This build has
> CONFIG_FANOTIFY not set.
> 
> I have used the fsnotify tree from next-20101109 for today.

I wasn't actually that commit it was:

5876b30fc2c91d67386f91da62b14f159d7bb41f ("fanotify: Do check against
max_marks and increase number of group marks atomically")

Lino, I knew there was a reason I was happy with the small race.  Would
you like to take another stab or should I just revert?

-Eric

Re: linux-next: build failure after merge of the fsnotify tree

[Lino Sanfilippo]

On Wed, Nov 10, 2010 at 10:32:23AM -0500, Eric Paris wrote:
> On Wed, 2010-11-10 at 12:53 +1100, Stephen Rothwell wrote:
> > Hi Eric,
> > 
> > After merging the fsnotify tree, today's linux-next build (powerpc
> > ppc64_defconfig) failed like this:
> > 
> > fs/notify/mark.c: In function 'fsnotify_add_mark':
> > fs/notify/mark.c:230: error: 'struct fsnotify_group' has no member named 'fanotify_data'
> > 
> > Caused by commit 0ed64ab6b338e4269c9f25de83781619ecd624f1 ("fsnotify:
> > code and error path cleanup in fsnotify_add_mark").  This build has
> > CONFIG_FANOTIFY not set.
> > 
> > I have used the fsnotify tree from next-20101109 for today.
> 
> I wasn't actually that commit it was:
> 
> 5876b30fc2c91d67386f91da62b14f159d7bb41f ("fanotify: Do check against
> max_marks and increase number of group marks atomically")
> 
> Lino, I knew there was a reason I was happy with the small race.  Would
> you like to take another stab or should I just revert?
> 
> -Eric
> 

Damn, sorry for that.
Please revert it Eric. But we should somehow avoid this race.  What about 
making max_marks a generic groups attribute?

Lino 
 

linux-next: build failure after merge of the fsnotify tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1596 bytes --]

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/

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]