Commit 5e00e318 authored by Tal Zussman's avatar Tal Zussman Committed by Andrew Morton
Browse files

userfaultfd: remove UFFD_CLOEXEC, UFFD_NONBLOCK, and UFFD_FLAGS_SET 

UFFD_CLOEXEC, UFFD_NONBLOCK, and UFFD_FLAGS_SET have been unused since
they were added in commit 932b18e0 ("userfaultfd:
linux/userfaultfd_k.h").  Remove them and the associated BUILD_BUG_ON()
checks.

Link: https://lkml.kernel.org/r/20250619-uffd-fixes-v3-4-a7274d3bd5e4@columbia.edu


Signed-off-by: default avatarTal Zussman <tz2294@columbia.edu>
Acked-by: default avatarDavid Hildenbrand <david@redhat.com>
Acked-by: default avatarPeter Xu <peterx@redhat.com>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Andrea Arcangeli <aarcange@redhat.com>
Cc: Christian Brauner <brauner@kernel.org>
Cc: Jan Kara <jack@suse.cz>
Cc: Jason A. Donenfeld <Jason@zx2c4.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 31defc3b

fs/userfaultfd.c

+0 −2
Original line number Diff line number Diff line
@@ -2114,8 +2114,6 @@ static int new_userfaultfd(int flags) 


	/* Check the UFFD_* constants for consistency.  */

	BUILD_BUG_ON(UFFD_USER_MODE_ONLY & UFFD_SHARED_FCNTL_FLAGS);

	BUILD_BUG_ON(UFFD_CLOEXEC != O_CLOEXEC);

	BUILD_BUG_ON(UFFD_NONBLOCK != O_NONBLOCK);



	if (flags & ~(UFFD_SHARED_FCNTL_FLAGS | UFFD_USER_MODE_ONLY))

		return -EINVAL;

include/linux/userfaultfd_k.h

+0 −4
Original line number Diff line number Diff line
@@ -30,11 +30,7 @@ 
 * from userfaultfd, in order to leave a free define-space for

 * shared O_* flags.

 */

#define UFFD_CLOEXEC O_CLOEXEC

#define UFFD_NONBLOCK O_NONBLOCK



#define UFFD_SHARED_FCNTL_FLAGS (O_CLOEXEC | O_NONBLOCK)

#define UFFD_FLAGS_SET (EFD_SHARED_FCNTL_FLAGS)



/*

 * Start with fault_pending_wqh and fault_wqh so they're more likely