aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/fs.h
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2009-08-20 11:43:41 -0400
committerJan Kara <jack@suse.cz>2009-09-14 11:08:15 -0400
commiteef99380679e20e7edc096aa4d8a98b875404d79 (patch)
tree358a39148e8513eed9ba6aaff13f6bf660a2ce1e /include/linux/fs.h
parent918941a3f3d46c2a69971b4718aaf13b1be2f1a7 (diff)
vfs: Rename generic_file_aio_write_nolock
generic_file_aio_write_nolock() is now used only by block devices and raw character device. Filesystems should use __generic_file_aio_write() in case generic_file_aio_write() doesn't suit them. So rename the function to blkdev_aio_write() and move it to fs/blockdev.c. Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Jan Kara <jack@suse.cz>
Diffstat (limited to 'include/linux/fs.h')
-rw-r--r--include/linux/fs.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/include/linux/fs.h b/include/linux/fs.h
index ea099d3a18d9..6c1be3a4edea 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -2207,8 +2207,6 @@ extern ssize_t generic_file_aio_read(struct kiocb *, const struct iovec *, unsig
2207extern ssize_t __generic_file_aio_write(struct kiocb *, const struct iovec *, unsigned long, 2207extern ssize_t __generic_file_aio_write(struct kiocb *, const struct iovec *, unsigned long,
2208 loff_t *); 2208 loff_t *);
2209extern ssize_t generic_file_aio_write(struct kiocb *, const struct iovec *, unsigned long, loff_t); 2209extern ssize_t generic_file_aio_write(struct kiocb *, const struct iovec *, unsigned long, loff_t);
2210extern ssize_t generic_file_aio_write_nolock(struct kiocb *, const struct iovec *,
2211 unsigned long, loff_t);
2212extern ssize_t generic_file_direct_write(struct kiocb *, const struct iovec *, 2210extern ssize_t generic_file_direct_write(struct kiocb *, const struct iovec *,
2213 unsigned long *, loff_t, loff_t *, size_t, size_t); 2211 unsigned long *, loff_t, loff_t *, size_t, size_t);
2214extern ssize_t generic_file_buffered_write(struct kiocb *, const struct iovec *, 2212extern ssize_t generic_file_buffered_write(struct kiocb *, const struct iovec *,
@@ -2218,6 +2216,10 @@ extern ssize_t do_sync_write(struct file *filp, const char __user *buf, size_t l
2218extern int generic_segment_checks(const struct iovec *iov, 2216extern int generic_segment_checks(const struct iovec *iov,
2219 unsigned long *nr_segs, size_t *count, int access_flags); 2217 unsigned long *nr_segs, size_t *count, int access_flags);
2220 2218
2219/* fs/block_dev.c */
2220extern ssize_t blkdev_aio_write(struct kiocb *iocb, const struct iovec *iov,
2221 unsigned long nr_segs, loff_t pos);
2222
2221/* fs/splice.c */ 2223/* fs/splice.c */
2222extern ssize_t generic_file_splice_read(struct file *, loff_t *, 2224extern ssize_t generic_file_splice_read(struct file *, loff_t *,
2223 struct pipe_inode_info *, size_t, unsigned int); 2225 struct pipe_inode_info *, size_t, unsigned int);