|
@@ -58,10 +58,7 @@ static ssize_t
|
|
|
ext4_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;
|
|
|
+ struct inode *inode = iocb->ki_filp->f_path.dentry->d_inode;
|
|
|
|
|
|
/*
|
|
|
* If we have encountered a bitmap-format file, the size limit
|
|
@@ -81,53 +78,7 @@ ext4_file_write(struct kiocb *iocb, const struct iovec *iov,
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- 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 (!ext4_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 = ext4_force_commit(inode->i_sb);
|
|
|
- if (err)
|
|
|
- return err;
|
|
|
- return ret;
|
|
|
+ return generic_file_aio_write(iocb, iov, nr_segs, pos);
|
|
|
}
|
|
|
|
|
|
static struct vm_operations_struct ext4_file_vm_ops = {
|