From: Chuck Lever <chuck.lever@oracle.com>
Date: Mon, 1 Jun 2026 15:06:45 +0000 (-0400)
Subject: Merge remote-tracking branches 'vfs/vfs-7.2.casefold', 'vfs/vfs-7.2.directory.delegat... 
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1cd8fad24a0a6ae4c03d9b754c06b57b0792711f;p=thirdparty%2Flinux.git

Merge remote-tracking branches 'vfs/vfs-7.2.casefold', 'vfs/vfs-7.2.directory.delegations' and 'vfs/vfs-7.2.exportfs' into vfs-7.2-merge
---

1cd8fad24a0a6ae4c03d9b754c06b57b0792711f
diff --cc include/linux/fsnotify_backend.h
index e5cde39d6e85d,95985400d3d8e,f8c8fb7f34ae0,95985400d3d8e..618eed4d6d724
--- a/include/linux/fsnotify_backend.h
+++ b/include/linux/fsnotify_backend.h
@@@@@ -915,9 -915,8 -935,9 -915,8 +935,10 @@@@@ extern void fsnotify_clear_marks_by_gro
    					  unsigned int obj_type);
    extern void fsnotify_get_mark(struct fsnotify_mark *mark);
    extern void fsnotify_put_mark(struct fsnotify_mark *mark);
 +++struct fsnotify_mark *fsnotify_next_mark(struct fsnotify_mark *mark);
    extern void fsnotify_finish_user_wait(struct fsnotify_iter_info *iter_info);
    extern bool fsnotify_prepare_user_wait(struct fsnotify_iter_info *iter_info);
++ +extern void fsnotify_modify_mark_mask(struct fsnotify_mark *mark, u32 set, u32 clear);
    
    static inline void fsnotify_init_event(struct fsnotify_event *event)
    {