fanotify: Wrap object_fh inline space in a creator macro

fanotify_error_event would duplicate this sequence of declarations that
already exist elsewhere with a slight different size.  Create a helper
macro to avoid code duplication.

Link: https://lore.kernel.org/r/20211025192746.66445-23-krisman@collabora.com
Suggested-by: Jan Kara <jack@suse.cz>
Reviewed-by: Amir Goldstein <amir73il@gmail.com>
Reviewed-by: Jan Kara <jack@suse.cz>
Signed-off-by: Gabriel Krisman Bertazi <krisman@collabora.com>
Signed-off-by: Jan Kara <jack@suse.cz>

diff --git a/fs/notify/fanotify/fanotify.h b/fs/notify/fanotify/fanotify.h
index 2b032b79d5b06da5c94fedddae7cafd4216936bf..3510d06654ed0ecfc2184a7ac863199f92300c7b 100644 (file)
--- a/fs/notify/fanotify/fanotify.h
+++ b/fs/notify/fanotify/fanotify.h
@@ -171,12 +171,18 @@ static inline void fanotify_init_event(struct fanotify_event *event,
        event->pid = NULL;
 }
 
+#define FANOTIFY_INLINE_FH(name, size)                                 \
+struct {                                                               \
+       struct fanotify_fh (name);                                      \
+       /* Space for object_fh.buf[] - access with fanotify_fh_buf() */ \
+       unsigned char _inline_fh_buf[(size)];                           \
+}
+
 struct fanotify_fid_event {
        struct fanotify_event fae;
        __kernel_fsid_t fsid;
-       struct fanotify_fh object_fh;
-       /* Reserve space in object_fh.buf[] - access with fanotify_fh_buf() */
-       unsigned char _inline_fh_buf[FANOTIFY_INLINE_FH_LEN];
+
+       FANOTIFY_INLINE_FH(object_fh, FANOTIFY_INLINE_FH_LEN);
 };
 
 static inline struct fanotify_fid_event *