Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b1dd3b28 authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds
Browse files

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: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 55ab3a1f

drivers/char/raw.c

+1 −1
Original line number Diff line number Diff line
@@ -248,7 +248,7 @@ static const struct file_operations raw_fops = { 
	.aio_read = 	generic_file_aio_read,

	.write	=	do_sync_write,

	.aio_write =	blkdev_aio_write,

	.fsync	=	block_fsync,

	.fsync	=	blkdev_fsync,

	.open	=	raw_open,

	.release=	raw_release,

	.ioctl	=	raw_ioctl,

fs/block_dev.c

+3 −3
Original line number Diff line number Diff line
@@ -404,7 +404,7 @@ static loff_t block_llseek(struct file *file, loff_t offset, int origin) 
 *	NULL first argument is nfsd_sync_dir() and that's not a directory.

 */

 

int block_fsync(struct file *filp, struct dentry *dentry, int datasync)

int blkdev_fsync(struct file *filp, struct dentry *dentry, int datasync)

{

	struct block_device *bdev = I_BDEV(filp->f_mapping->host);

	int error;
@@ -418,7 +418,7 @@ int block_fsync(struct file *filp, struct dentry *dentry, int datasync) 
		error = 0;

	return error;

}

EXPORT_SYMBOL(block_fsync);

EXPORT_SYMBOL(blkdev_fsync);



/*

 * pseudo-fs
@@ -1482,7 +1482,7 @@ const struct file_operations def_blk_fops = { 
  	.aio_read	= generic_file_aio_read,

	.aio_write	= blkdev_aio_write,

	.mmap		= generic_file_mmap,

	.fsync		= block_fsync,

	.fsync		= blkdev_fsync,

	.unlocked_ioctl	= block_ioctl,

#ifdef CONFIG_COMPAT

	.compat_ioctl	= compat_blkdev_ioctl,

include/linux/fs.h

+1 −1
Original line number Diff line number Diff line
@@ -2212,7 +2212,7 @@ extern int generic_segment_checks(const struct iovec *iov, 
/* fs/block_dev.c */

extern ssize_t blkdev_aio_write(struct kiocb *iocb, const struct iovec *iov,

				unsigned long nr_segs, loff_t pos);

extern int block_fsync(struct file *filp, struct dentry *dentry, int datasync);

extern int blkdev_fsync(struct file *filp, struct dentry *dentry, int datasync);



/* fs/splice.c */

extern ssize_t generic_file_splice_read(struct file *, loff_t *,