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

Commit 4142e0d1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'osync_cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6 

* 'osync_cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6:
  fsync: wait for data writeout completion before calling ->fsync
  vfs: Remove generic_osync_inode() and sync_page_range{_nolock}()
  fat: Opencode sync_page_range_nolock()
  pohmelfs: Use new syncing helper
  xfs: Convert sync_page_range() to simple filemap_write_and_wait_range()
  ocfs2: Update syncing after splicing to match generic version
  ntfs: Use new syncing helpers and update comments
  ext4: Remove syncing logic from ext4_file_write
  ext3: Remove syncing logic from ext3_file_write
  ext2: Update comment about generic_osync_inode
  vfs: Introduce new helpers for syncing after writing to O_SYNC file or IS_SYNC inode
  vfs: Rename generic_file_aio_write_nolock
  ocfs2: Use __generic_file_aio_write instead of generic_file_aio_write_nolock
  pohmelfs: Use __generic_file_aio_write instead of generic_file_aio_write_nolock
  vfs: Remove syncing from generic_file_direct_write() and generic_file_buffered_write()
  vfs: Export __generic_file_aio_write() and add some comments
  vfs: Introduce filemap_fdatawait_range
parents 33f1de69 2daea67e

drivers/char/raw.c

+1 −1
Original line number Diff line number Diff line
@@ -246,7 +246,7 @@ static const struct file_operations raw_fops = { 
	.read	=	do_sync_read,

	.aio_read = 	generic_file_aio_read,

	.write	=	do_sync_write,

	.aio_write = 	generic_file_aio_write_nolock,

	.aio_write =	blkdev_aio_write,

	.open	=	raw_open,

	.release=	raw_release,

	.ioctl	=	raw_ioctl,

drivers/staging/pohmelfs/inode.c

+3 −3
Original line number Diff line number Diff line
@@ -921,16 +921,16 @@ ssize_t pohmelfs_write(struct file *file, const char __user *buf, 
	if (ret)

		goto err_out_unlock;



	ret = generic_file_aio_write_nolock(&kiocb, &iov, 1, pos);

	ret = __generic_file_aio_write(&kiocb, &iov, 1, &kiocb.ki_pos);

	*ppos = kiocb.ki_pos;



	mutex_unlock(&inode->i_mutex);

	WARN_ON(ret < 0);



	if (ret > 0 && ((file->f_flags & O_SYNC) || IS_SYNC(inode))) {

	if (ret > 0) {

		ssize_t err;



		err = sync_page_range(inode, mapping, pos, ret);

		err = generic_write_sync(file, pos, ret);

		if (err < 0)

			ret = err;

		WARN_ON(ret < 0);

fs/block_dev.c

+28 −1
Original line number Diff line number Diff line
@@ -1404,6 +1404,33 @@ static long block_ioctl(struct file *file, unsigned cmd, unsigned long arg) 
	return blkdev_ioctl(bdev, mode, cmd, arg);

}



/*

 * Write data to the block device.  Only intended for the block device itself

 * and the raw driver which basically is a fake block device.

 *

 * Does not take i_mutex for the write and thus is not for general purpose

 * use.

 */

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

			 unsigned long nr_segs, loff_t pos)

{

	struct file *file = iocb->ki_filp;

	ssize_t ret;



	BUG_ON(iocb->ki_pos != pos);



	ret = __generic_file_aio_write(iocb, iov, nr_segs, &iocb->ki_pos);

	if (ret > 0 || ret == -EIOCBQUEUED) {

		ssize_t err;



		err = generic_write_sync(file, pos, ret);

		if (err < 0 && ret > 0)

			ret = err;

	}

	return ret;

}

EXPORT_SYMBOL_GPL(blkdev_aio_write);



/*

 * Try to release a page associated with block device when the system

 * is under memory pressure.
@@ -1436,7 +1463,7 @@ const struct file_operations def_blk_fops = { 
	.read		= do_sync_read,

	.write		= do_sync_write,

  	.aio_read	= generic_file_aio_read,

  	.aio_write	= generic_file_aio_write_nolock,

	.aio_write	= blkdev_aio_write,

	.mmap		= generic_file_mmap,

	.fsync		= block_fsync,

	.unlocked_ioctl	= block_ioctl,

fs/ext2/inode.c

+1 −1
Original line number Diff line number Diff line
@@ -482,7 +482,7 @@ static int ext2_alloc_branch(struct inode *inode, 
		unlock_buffer(bh);

		mark_buffer_dirty_inode(bh, inode);

		/* We used to sync bh here if IS_SYNC(inode).

		 * But we now rely upon generic_osync_inode()

		 * But we now rely upon generic_write_sync()

		 * and b_inode_buffers.  But not for directories.

		 */

		if (S_ISDIR(inode->i_mode) && IS_DIRSYNC(inode))

fs/ext3/file.c

+1 −60
Original line number Diff line number Diff line
@@ -51,71 +51,12 @@ static int ext3_release_file (struct inode * inode, struct file * filp) 
	return 0;

}



static ssize_t

ext3_file_write(struct kiocb *iocb, const struct iovec *iov,

		unsigned long nr_segs, loff_t pos)

{

	struct file *file = iocb->ki_filp;

	struct inode *inode = file->f_path.dentry->d_inode;

	ssize_t ret;

	int err;



	ret = generic_file_aio_write(iocb, iov, nr_segs, pos);



	/*

	 * Skip flushing if there was an error, or if nothing was written.

	 */

	if (ret <= 0)

		return ret;



	/*

	 * If the inode is IS_SYNC, or is O_SYNC and we are doing data

	 * journalling then we need to make sure that we force the transaction

	 * to disk to keep all metadata uptodate synchronously.

	 */

	if (file->f_flags & O_SYNC) {

		/*

		 * If we are non-data-journaled, then the dirty data has

		 * already been flushed to backing store by generic_osync_inode,

		 * and the inode has been flushed too if there have been any

		 * modifications other than mere timestamp updates.

		 *

		 * Open question --- do we care about flushing timestamps too

		 * if the inode is IS_SYNC?

		 */

		if (!ext3_should_journal_data(inode))

			return ret;



		goto force_commit;

	}



	/*

	 * So we know that there has been no forced data flush.  If the inode

	 * is marked IS_SYNC, we need to force one ourselves.

	 */

	if (!IS_SYNC(inode))

		return ret;



	/*

	 * Open question #2 --- should we force data to disk here too?  If we

	 * don't, the only impact is that data=writeback filesystems won't

	 * flush data to disk automatically on IS_SYNC, only metadata (but

	 * historically, that is what ext2 has done.)

	 */



force_commit:

	err = ext3_force_commit(inode->i_sb);

	if (err)

		return err;

	return ret;

}



const struct file_operations ext3_file_operations = {

	.llseek		= generic_file_llseek,

	.read		= do_sync_read,

	.write		= do_sync_write,

	.aio_read	= generic_file_aio_read,

	.aio_write	= ext3_file_write,

	.aio_write	= generic_file_aio_write,

	.unlocked_ioctl	= ext3_ioctl,

#ifdef CONFIG_COMPAT

	.compat_ioctl	= ext3_compat_ioctl,