Skip to content

Commit 1219e0f

Browse files
amir73ilbrauner
authored andcommitted
fs: move initializing f_mode before file_ref_init()
The comment above file_ref_init() says: "We're SLAB_TYPESAFE_BY_RCU so initialize f_ref last." but file_set_fsnotify_mode() was added after file_ref_init(). Move it right after setting f_mode, where it makes more sense. Fixes: 711f9b8 ("fsnotify: disable pre-content and permission events by default") Signed-off-by: Amir Goldstein <amir73il@gmail.com> Link: https://patch.msgid.link/20260109211536.3565697-1-amir73il@gmail.com Reviewed-by: Jan Kara <jack@suse.cz> Signed-off-by: Christian Brauner <brauner@kernel.org>
1 parent 46329a9 commit 1219e0f

1 file changed

Lines changed: 5 additions & 5 deletions

File tree

fs/file_table.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -176,6 +176,11 @@ static int init_file(struct file *f, int flags, const struct cred *cred)
176176

177177
f->f_flags = flags;
178178
f->f_mode = OPEN_FMODE(flags);
179+
/*
180+
* Disable permission and pre-content events for all files by default.
181+
* They may be enabled later by fsnotify_open_perm_and_set_mode().
182+
*/
183+
file_set_fsnotify_mode(f, FMODE_NONOTIFY_PERM);
179184

180185
f->f_op = NULL;
181186
f->f_mapping = NULL;
@@ -197,11 +202,6 @@ static int init_file(struct file *f, int flags, const struct cred *cred)
197202
* refcount bumps we should reinitialize the reused file first.
198203
*/
199204
file_ref_init(&f->f_ref, 1);
200-
/*
201-
* Disable permission and pre-content events for all files by default.
202-
* They may be enabled later by fsnotify_open_perm_and_set_mode().
203-
*/
204-
file_set_fsnotify_mode(f, FMODE_NONOTIFY_PERM);
205205
return 0;
206206
}
207207

0 commit comments

Comments
 (0)