mirror of
https://github.com/torvalds/linux.git
synced 2024-11-22 12:11:40 +00:00
xip sendfile removal
This patch removes xip_file_sendfile, the sendfile implementation for xip without replacement. Those customers that use xip on s390 are not using sendfile() as far as we know, and so far s390 is the only platform this could potentially be used on so far. Having sendfile is not a popular feature for execute in place file systems, however we have a working implementation of splice_read() based on fs/splice.c if anyone asks for it. At this point in time, it does not seem preferable to merge splice_read() for xip because it causes extra maintenence effort due to code duplication and it requires struct page behind the xip memory segment. We'd like to get rid of that in favor of supporting flash based embedded platforms (Monta Vista work) soon. Signed-off-by: Carsten Otte <cotte@de.ibm.com> Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
This commit is contained in:
parent
932cc6d4f7
commit
d054fe3d10
@ -70,7 +70,6 @@ const struct file_operations ext2_xip_file_operations = {
|
||||
.open = generic_file_open,
|
||||
.release = ext2_release_file,
|
||||
.fsync = ext2_sync_file,
|
||||
.sendfile = xip_file_sendfile,
|
||||
};
|
||||
#endif
|
||||
|
||||
|
@ -1791,9 +1791,6 @@ extern int nonseekable_open(struct inode * inode, struct file * filp);
|
||||
#ifdef CONFIG_FS_XIP
|
||||
extern ssize_t xip_file_read(struct file *filp, char __user *buf, size_t len,
|
||||
loff_t *ppos);
|
||||
extern ssize_t xip_file_sendfile(struct file *in_file, loff_t *ppos,
|
||||
size_t count, read_actor_t actor,
|
||||
void *target);
|
||||
extern int xip_file_mmap(struct file * file, struct vm_area_struct * vma);
|
||||
extern ssize_t xip_file_write(struct file *filp, const char __user *buf,
|
||||
size_t len, loff_t *ppos);
|
||||
|
@ -159,28 +159,6 @@ xip_file_read(struct file *filp, char __user *buf, size_t len, loff_t *ppos)
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(xip_file_read);
|
||||
|
||||
ssize_t
|
||||
xip_file_sendfile(struct file *in_file, loff_t *ppos,
|
||||
size_t count, read_actor_t actor, void *target)
|
||||
{
|
||||
read_descriptor_t desc;
|
||||
|
||||
if (!count)
|
||||
return 0;
|
||||
|
||||
desc.written = 0;
|
||||
desc.count = count;
|
||||
desc.arg.data = target;
|
||||
desc.error = 0;
|
||||
|
||||
do_xip_mapping_read(in_file->f_mapping, &in_file->f_ra, in_file,
|
||||
ppos, &desc, actor);
|
||||
if (desc.written)
|
||||
return desc.written;
|
||||
return desc.error;
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(xip_file_sendfile);
|
||||
|
||||
/*
|
||||
* __xip_unmap is invoked from xip_unmap and
|
||||
* xip_write
|
||||
|
Loading…
Reference in New Issue
Block a user