* [PATCH -next] fs: mount_notify.c: fix build without CONFIG_FSINFO
@ 2020-08-05 13:11 Randy Dunlap
2020-08-05 13:59 ` David Howells
0 siblings, 1 reply; 2+ messages in thread
From: Randy Dunlap @ 2020-08-05 13:11 UTC (permalink / raw)
To: Linux FS Devel, linux-next@vger•kernel.org, David Howells,
Al Viro, Stephen Rothwell
From: Randy Dunlap <rdunlap@infradead•org>
Fix mount_notify.c build errors when CONFIG_FSINFO is not set/enabled:
../fs/mount_notify.c:94:28: error: 'struct mount' has no member named 'mnt_unique_id'; did you mean 'mnt_group_id'?
../fs/mount_notify.c:109:28: error: 'struct mount' has no member named 'mnt_unique_id'; did you mean 'mnt_group_id'?
Signed-off-by: Randy Dunlap <rdunlap@infradead•org>
Cc: David Howells <dhowells@redhat•com>
Cc: Alexander Viro <viro@zeniv•linux.org.uk>
Cc: linux-fsdevel@vger•kernel.org
---
fs/mount_notify.c | 4 ++++
1 file changed, 4 insertions(+)
--- linux-next-20200805.orig/fs/mount_notify.c
+++ linux-next-20200805/fs/mount_notify.c
@@ -91,7 +91,9 @@ void notify_mount(struct mount *trigger,
n.watch.type = WATCH_TYPE_MOUNT_NOTIFY;
n.watch.subtype = subtype;
n.watch.info = info_flags | watch_sizeof(n);
+#ifdef CONFIG_FSINFO
n.triggered_on = trigger->mnt_unique_id;
+#endif
smp_wmb(); /* See fsinfo_generic_mount_info(). */
@@ -106,7 +108,9 @@ void notify_mount(struct mount *trigger,
case NOTIFY_MOUNT_UNMOUNT:
case NOTIFY_MOUNT_MOVE_FROM:
case NOTIFY_MOUNT_MOVE_TO:
+#ifdef CONFIG_FSINFO
n.auxiliary_mount = aux->mnt_unique_id;
+#endif
atomic_long_inc(&trigger->mnt_topology_changes);
atomic_long_inc(&aux->mnt_topology_changes);
break;
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH -next] fs: mount_notify.c: fix build without CONFIG_FSINFO
2020-08-05 13:11 [PATCH -next] fs: mount_notify.c: fix build without CONFIG_FSINFO Randy Dunlap
@ 2020-08-05 13:59 ` David Howells
0 siblings, 0 replies; 2+ messages in thread
From: David Howells @ 2020-08-05 13:59 UTC (permalink / raw)
To: Randy Dunlap
Cc: dhowells, Linux FS Devel, linux-next@vger•kernel.org, Al Viro,
Stephen Rothwell
Hi Randy,
> From: Randy Dunlap <rdunlap@infradead•org>
>
> Fix mount_notify.c build errors when CONFIG_FSINFO is not set/enabled:
>
> ../fs/mount_notify.c:94:28: error: 'struct mount' has no member named 'mnt_unique_id'; did you mean 'mnt_group_id'?
> ../fs/mount_notify.c:109:28: error: 'struct mount' has no member named 'mnt_unique_id'; did you mean 'mnt_group_id'?
>
> Signed-off-by: Randy Dunlap <rdunlap@infradead•org>
> Cc: David Howells <dhowells@redhat•com>
> Cc: Alexander Viro <viro@zeniv•linux.org.uk>
> Cc: linux-fsdevel@vger•kernel.org
That's not quite the right solution. I'm going to use the attached instead.
David
---
commit 830d864747b00d979914f15adaad58ccb9fd77f6
Author: Randy Dunlap <rdunlap@infradead•org>
Date: Wed Aug 5 06:11:32 2020 -0700
fs: mount_notify.c: fix build without CONFIG_FSINFO
Fix mount_notify.c build errors when CONFIG_FSINFO is not set/enabled:
../fs/mount_notify.c:94:28: error: 'struct mount' has no member named 'mnt_unique_id'; did you mean 'mnt_group_id'?
../fs/mount_notify.c:109:28: error: 'struct mount' has no member named 'mnt_unique_id'; did you mean 'mnt_group_id'?
[DH: Fix this to use mnt_id if CONFIG_FSINFO=n rather than not setting
anything]
Signed-off-by: Randy Dunlap <rdunlap@infradead•org>
Cc: David Howells <dhowells@redhat•com>
Cc: Alexander Viro <viro@zeniv•linux.org.uk>
Cc: linux-fsdevel@vger•kernel.org
Signed-off-by: David Howells <dhowells@redhat•com>
diff --git a/fs/mount_notify.c b/fs/mount_notify.c
index 57995c27ca88..254090b6d5ac 100644
--- a/fs/mount_notify.c
+++ b/fs/mount_notify.c
@@ -91,7 +91,11 @@ void notify_mount(struct mount *trigger,
n.watch.type = WATCH_TYPE_MOUNT_NOTIFY;
n.watch.subtype = subtype;
n.watch.info = info_flags | watch_sizeof(n);
+#ifdef CONFIG_FSINFO
n.triggered_on = trigger->mnt_unique_id;
+#else
+ n.triggered_on = trigger->mnt_id;
+#endif
smp_wmb(); /* See fsinfo_generic_mount_info(). */
@@ -106,7 +110,11 @@ void notify_mount(struct mount *trigger,
case NOTIFY_MOUNT_UNMOUNT:
case NOTIFY_MOUNT_MOVE_FROM:
case NOTIFY_MOUNT_MOVE_TO:
+#ifdef CONFIG_FSINFO
n.auxiliary_mount = aux->mnt_unique_id;
+#else
+ n.auxiliary_mount = aux->mnt_id;
+#endif
atomic_long_inc(&trigger->mnt_topology_changes);
atomic_long_inc(&aux->mnt_topology_changes);
break;
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-08-05 19:54 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-08-05 13:11 [PATCH -next] fs: mount_notify.c: fix build without CONFIG_FSINFO Randy Dunlap
2020-08-05 13:59 ` David Howells
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox