Commit d96e6e71 authored by Jens Axboe's avatar Jens Axboe
Browse files

Remove remnants of sendfile() 



There are now zero users of .sendfile() in the kernel, so kill
it from the file_operations structure and in do_sendfile().

Signed-off-by: default avatarJens Axboe <jens.axboe@oracle.com>
parent d054fe3d

fs/read_write.c

+11 −15
Original line number Diff line number Diff line
@@ -724,8 +724,7 @@ static ssize_t do_sendfile(int out_fd, int in_fd, loff_t *ppos, 
	in_inode = in_file->f_path.dentry->d_inode;

	if (!in_inode)

		goto fput_in;

	if (!in_file->f_op || (!in_file->f_op->sendfile &&

	    !in_file->f_op->splice_read))

	if (!in_file->f_op || !in_file->f_op->splice_read)

		goto fput_in;

	retval = -ESPIPE;

	if (!ppos)
@@ -778,7 +777,6 @@ static ssize_t do_sendfile(int out_fd, int in_fd, loff_t *ppos, 
		count = max - pos;

	}



	if (in_file->f_op->splice_read) {

	fl = 0;

#if 0

	/*
@@ -791,8 +789,6 @@ static ssize_t do_sendfile(int out_fd, int in_fd, loff_t *ppos, 
		fl = SPLICE_F_NONBLOCK;

#endif

	retval = do_splice_direct(in_file, ppos, out_file, count, fl);

	} else

		retval = in_file->f_op->sendfile(in_file, ppos, count, file_send_actor, out_file);



	if (retval > 0) {

		add_rchar(current, retval);

include/linux/fs.h

+1 −2
Original line number Diff line number Diff line
@@ -1054,7 +1054,7 @@ struct block_device_operations { 
};



/*

 * "descriptor" for what we're up to with a read for sendfile().

 * "descriptor" for what we're up to with a read.

 * This allows us to use the same read code yet

 * have multiple different users of the data that

 * we read from a file.
@@ -1105,7 +1105,6 @@ struct file_operations { 
	int (*aio_fsync) (struct kiocb *, int datasync);

	int (*fasync) (int, struct file *, int);

	int (*lock) (struct file *, int, struct file_lock *);

	ssize_t (*sendfile) (struct file *, loff_t *, size_t, read_actor_t, void *);

	ssize_t (*sendpage) (struct file *, struct page *, int, size_t, loff_t *, int);

	unsigned long (*get_unmapped_area)(struct file *, unsigned long, unsigned long, unsigned long, unsigned long);

	int (*check_flags)(int);