aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Morton <akpm@linux-foundation.org>2010-04-06 17:35:00 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2010-04-07 11:38:04 -0400
commitb1dd3b2843b3b73b7fc2ee47d96310cd1c051371 (patch)
treeab7d13e076d255dd2c598a3c819e114a854ae85f
parent55ab3a1ff843e3f0e24d2da44e71bffa5d853010 (diff)
vfs: rename block_fsync() to blkdev_fsync()
Requested by hch, for consistency now it is exported. Cc: Alexander Viro <viro@zeniv.linux.org.uk> Cc: Anton Blanchard <anton@samba.org> Cc: Christoph Hellwig <hch@lst.de> Cc: Jan Kara <jack@suse.cz> Cc: Jeff Moyer <jmoyer@redhat.com> Cc: Jens Axboe <jens.axboe@oracle.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--drivers/char/raw.c2
-rw-r--r--fs/block_dev.c6
-rw-r--r--include/linux/fs.h2
3 files changed, 5 insertions, 5 deletions
diff --git a/drivers/char/raw.c b/drivers/char/raw.c
index f5a32317b751..8756ab0daa8b 100644
--- a/drivers/char/raw.c
+++ b/drivers/char/raw.c
@@ -248,7 +248,7 @@ static const struct file_operations raw_fops = {
248 .aio_read = generic_file_aio_read, 248 .aio_read = generic_file_aio_read,
249 .write = do_sync_write, 249 .write = do_sync_write,
250 .aio_write = blkdev_aio_write, 250 .aio_write = blkdev_aio_write,
251 .fsync = block_fsync, 251 .fsync = blkdev_fsync,
252 .open = raw_open, 252 .open = raw_open,
253 .release= raw_release, 253 .release= raw_release,
254 .ioctl = raw_ioctl, 254 .ioctl = raw_ioctl,
diff --git a/fs/block_dev.c b/fs/block_dev.c
index 8db62b2b6df8..2a6d0193f139 100644
--- a/fs/block_dev.c
+++ b/fs/block_dev.c
@@ -404,7 +404,7 @@ static loff_t block_llseek(struct file *file, loff_t offset, int origin)
404 * NULL first argument is nfsd_sync_dir() and that's not a directory. 404 * NULL first argument is nfsd_sync_dir() and that's not a directory.
405 */ 405 */
406 406
407int block_fsync(struct file *filp, struct dentry *dentry, int datasync) 407int blkdev_fsync(struct file *filp, struct dentry *dentry, int datasync)
408{ 408{
409 struct block_device *bdev = I_BDEV(filp->f_mapping->host); 409 struct block_device *bdev = I_BDEV(filp->f_mapping->host);
410 int error; 410 int error;
@@ -418,7 +418,7 @@ int block_fsync(struct file *filp, struct dentry *dentry, int datasync)
418 error = 0; 418 error = 0;
419 return error; 419 return error;
420} 420}
421EXPORT_SYMBOL(block_fsync); 421EXPORT_SYMBOL(blkdev_fsync);
422 422
423/* 423/*
424 * pseudo-fs 424 * pseudo-fs
@@ -1482,7 +1482,7 @@ const struct file_operations def_blk_fops = {
1482 .aio_read = generic_file_aio_read, 1482 .aio_read = generic_file_aio_read,
1483 .aio_write = blkdev_aio_write, 1483 .aio_write = blkdev_aio_write,
1484 .mmap = generic_file_mmap, 1484 .mmap = generic_file_mmap,
1485 .fsync = block_fsync, 1485 .fsync = blkdev_fsync,
1486 .unlocked_ioctl = block_ioctl, 1486 .unlocked_ioctl = block_ioctl,
1487#ifdef CONFIG_COMPAT 1487#ifdef CONFIG_COMPAT
1488 .compat_ioctl = compat_blkdev_ioctl, 1488 .compat_ioctl = compat_blkdev_ioctl,
diff --git a/include/linux/fs.h b/include/linux/fs.h
index 5d9c7e27c5a4..39d57bc6cc71 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -2212,7 +2212,7 @@ extern int generic_segment_checks(const struct iovec *iov,
2212/* fs/block_dev.c */ 2212/* fs/block_dev.c */
2213extern ssize_t blkdev_aio_write(struct kiocb *iocb, const struct iovec *iov, 2213extern ssize_t blkdev_aio_write(struct kiocb *iocb, const struct iovec *iov,
2214 unsigned long nr_segs, loff_t pos); 2214 unsigned long nr_segs, loff_t pos);
2215extern int block_fsync(struct file *filp, struct dentry *dentry, int datasync); 2215extern int blkdev_fsync(struct file *filp, struct dentry *dentry, int datasync);
2216 2216
2217/* fs/splice.c */ 2217/* fs/splice.c */
2218extern ssize_t generic_file_splice_read(struct file *, loff_t *, 2218extern ssize_t generic_file_splice_read(struct file *, loff_t *,