Unverified Commit f326565c authored by Yuichiro Tsuji's avatar Yuichiro Tsuji Committed by Christian Brauner
Browse files

ioctl: Fix return type of several functions from long to int 



Fix the return type of several functions from long to int to match its actu
al behavior. These functions only return int values. This change improves
type consistency across the filesystem code and aligns the function signatu
re with its existing implementation and usage.

Reviewed-by: default avatarJan Kara <jack@suse.cz>
Signed-off-by: default avatarYuichiro Tsuji <yuichtsu@amazon.com>
Link: https://lore.kernel.org/r/20250121070844.4413-3-yuichtsu@amazon.com


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

fs/ioctl.c

+5 −5
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ 
 *

 * Returns 0 on success, -errno on error.

 */

long vfs_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)

int vfs_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)

{

	int error = -ENOTTY;
@@ -228,7 +228,7 @@ static int ioctl_fiemap(struct file *filp, struct fiemap __user *ufiemap) 
	return error;

}



static long ioctl_file_clone(struct file *dst_file, unsigned long srcfd,

static int ioctl_file_clone(struct file *dst_file, unsigned long srcfd,

			    u64 off, u64 olen, u64 destoff)

{

	CLASS(fd, src_file)(srcfd);
@@ -248,7 +248,7 @@ static long ioctl_file_clone(struct file *dst_file, unsigned long srcfd, 
	return ret;

}



static long ioctl_file_clone_range(struct file *file,

static int ioctl_file_clone_range(struct file *file,

				  struct file_clone_range __user *argp)

{

	struct file_clone_range args;

include/linux/fs.h

+1 −1
Original line number Diff line number Diff line
@@ -2030,7 +2030,7 @@ int vfs_fchown(struct file *file, uid_t user, gid_t group); 
int vfs_fchmod(struct file *file, umode_t mode);

int vfs_utimes(const struct path *path, struct timespec64 *times);



extern long vfs_ioctl(struct file *file, unsigned int cmd, unsigned long arg);

int vfs_ioctl(struct file *file, unsigned int cmd, unsigned long arg);



#ifdef CONFIG_COMPAT

extern long compat_ptr_ioctl(struct file *file, unsigned int cmd,