Unverified Commit 7d84d1b9 authored by Christian Brauner's avatar Christian Brauner
Browse files

fs: rely on ->iterate_shared to determine f_pos locking 



Now that we removed ->iterate we don't need to check for either
->iterate or ->iterate_shared in file_needs_f_pos_lock(). Simply check
for ->iterate_shared instead. This will tell us whether we need to
unconditionally take the lock. Not just does it allow us to avoid
checking f_inode's mode it also actually clearly shows that we're
locking because of readdir.

Signed-off-by: default avatarChristian Brauner <brauner@kernel.org>
parent 3e327154

fs/file.c

+1 −1
Original line number Diff line number Diff line
@@ -1049,7 +1049,7 @@ unsigned long __fdget_raw(unsigned int fd) 
static inline bool file_needs_f_pos_lock(struct file *file)

{

	return (file->f_mode & FMODE_ATOMIC_POS) &&

		(file_count(file) > 1 || S_ISDIR(file_inode(file)->i_mode));

		(file_count(file) > 1 || file->f_op->iterate_shared);

}



unsigned long __fdget_pos(unsigned int fd)