Commit cab05152 authored by Al Viro's avatar Al Viro
Browse files

move close_range(2) into fs/file.c, fold __close_range() into it 



	We never had callers for __close_range() except for close_range(2)
itself.  Nothing of that sort has appeared in four years and if any users
do show up, we can always separate those suckers again.

Reviewed-by: default avatarChristian Brauner <brauner@kernel.org>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 1fa4ffd8

fs/file.c

+4 −2
Original line number Diff line number Diff line
@@ -713,7 +713,7 @@ static inline void __range_close(struct files_struct *files, unsigned int fd, 
}



/**

 * __close_range() - Close all file descriptors in a given range.

 * sys_close_range() - Close all file descriptors in a given range.

 *

 * @fd:     starting file descriptor to close

 * @max_fd: last file descriptor to close
@@ -721,8 +721,10 @@ static inline void __range_close(struct files_struct *files, unsigned int fd, 
 *

 * This closes a range of file descriptors. All file descriptors

 * from @fd up to and including @max_fd are closed.

 * Currently, errors to close a given file descriptor are ignored.

 */

int __close_range(unsigned fd, unsigned max_fd, unsigned int flags)

SYSCALL_DEFINE3(close_range, unsigned int, fd, unsigned int, max_fd,

		unsigned int, flags)

{

	struct task_struct *me = current;

	struct files_struct *cur_fds = me->files, *fds = NULL;

fs/open.c

+0 −17
Original line number Diff line number Diff line
@@ -1574,23 +1574,6 @@ SYSCALL_DEFINE1(close, unsigned int, fd) 
	return retval;

}



/**

 * sys_close_range() - Close all file descriptors in a given range.

 *

 * @fd:     starting file descriptor to close

 * @max_fd: last file descriptor to close

 * @flags:  reserved for future extensions

 *

 * This closes a range of file descriptors. All file descriptors

 * from @fd up to and including @max_fd are closed.

 * Currently, errors to close a given file descriptor are ignored.

 */

SYSCALL_DEFINE3(close_range, unsigned int, fd, unsigned int, max_fd,

		unsigned int, flags)

{

	return __close_range(fd, max_fd, flags);

}



/*

 * This routine simulates a hangup on the tty, to arrange that users

 * are given clean terminals at login time.

include/linux/fdtable.h

+0 −1
Original line number Diff line number Diff line
@@ -111,7 +111,6 @@ int iterate_fd(struct files_struct *, unsigned, 
		const void *);



extern int close_fd(unsigned int fd);

extern int __close_range(unsigned int fd, unsigned int max_fd, unsigned int flags);

extern struct file *file_close_fd(unsigned int fd);



extern struct kmem_cache *files_cachep;