ntfs: Use new syncing helpers and update comments
Use new syncing helpers in .write and .aio_write functions. Also remove superfluous syncing in ntfs_file_buffered_write() and update comments about generic_osync_inode(). CC: Anton Altaparmakov <aia21@cantab.net> CC: linux-ntfs-dev@lists.sourceforge.net Signed-off-by: Jan Kara <jack@suse.cz>
This commit is contained in:
parent
0d34ec62e1
commit
ebbbf757c6
|
@ -2076,14 +2076,6 @@ err_out:
|
||||||
*ppos = pos;
|
*ppos = pos;
|
||||||
if (cached_page)
|
if (cached_page)
|
||||||
page_cache_release(cached_page);
|
page_cache_release(cached_page);
|
||||||
/* For now, when the user asks for O_SYNC, we actually give O_DSYNC. */
|
|
||||||
if (likely(!status)) {
|
|
||||||
if (unlikely((file->f_flags & O_SYNC) || IS_SYNC(vi))) {
|
|
||||||
if (!mapping->a_ops->writepage || !is_sync_kiocb(iocb))
|
|
||||||
status = generic_osync_inode(vi, mapping,
|
|
||||||
OSYNC_METADATA|OSYNC_DATA);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
pagevec_lru_add_file(&lru_pvec);
|
pagevec_lru_add_file(&lru_pvec);
|
||||||
ntfs_debug("Done. Returning %s (written 0x%lx, status %li).",
|
ntfs_debug("Done. Returning %s (written 0x%lx, status %li).",
|
||||||
written ? "written" : "status", (unsigned long)written,
|
written ? "written" : "status", (unsigned long)written,
|
||||||
|
@ -2145,8 +2137,8 @@ static ssize_t ntfs_file_aio_write(struct kiocb *iocb, const struct iovec *iov,
|
||||||
mutex_lock(&inode->i_mutex);
|
mutex_lock(&inode->i_mutex);
|
||||||
ret = ntfs_file_aio_write_nolock(iocb, iov, nr_segs, &iocb->ki_pos);
|
ret = ntfs_file_aio_write_nolock(iocb, iov, nr_segs, &iocb->ki_pos);
|
||||||
mutex_unlock(&inode->i_mutex);
|
mutex_unlock(&inode->i_mutex);
|
||||||
if (ret > 0 && ((file->f_flags & O_SYNC) || IS_SYNC(inode))) {
|
if (ret > 0) {
|
||||||
int err = sync_page_range(inode, mapping, pos, ret);
|
int err = generic_write_sync(file, pos, ret);
|
||||||
if (err < 0)
|
if (err < 0)
|
||||||
ret = err;
|
ret = err;
|
||||||
}
|
}
|
||||||
|
@ -2173,8 +2165,8 @@ static ssize_t ntfs_file_writev(struct file *file, const struct iovec *iov,
|
||||||
if (ret == -EIOCBQUEUED)
|
if (ret == -EIOCBQUEUED)
|
||||||
ret = wait_on_sync_kiocb(&kiocb);
|
ret = wait_on_sync_kiocb(&kiocb);
|
||||||
mutex_unlock(&inode->i_mutex);
|
mutex_unlock(&inode->i_mutex);
|
||||||
if (ret > 0 && ((file->f_flags & O_SYNC) || IS_SYNC(inode))) {
|
if (ret > 0) {
|
||||||
int err = sync_page_range(inode, mapping, *ppos - ret, ret);
|
int err = generic_write_sync(file, *ppos - ret, ret);
|
||||||
if (err < 0)
|
if (err < 0)
|
||||||
ret = err;
|
ret = err;
|
||||||
}
|
}
|
||||||
|
|
|
@ -384,13 +384,12 @@ unm_err_out:
|
||||||
* it is dirty in the inode meta data rather than the data page cache of the
|
* it is dirty in the inode meta data rather than the data page cache of the
|
||||||
* inode, and thus there are no data pages that need writing out. Therefore, a
|
* inode, and thus there are no data pages that need writing out. Therefore, a
|
||||||
* full mark_inode_dirty() is overkill. A mark_inode_dirty_sync(), on the
|
* full mark_inode_dirty() is overkill. A mark_inode_dirty_sync(), on the
|
||||||
* other hand, is not sufficient, because I_DIRTY_DATASYNC needs to be set to
|
* other hand, is not sufficient, because ->write_inode needs to be called even
|
||||||
* ensure ->write_inode is called from generic_osync_inode() and this needs to
|
* in case of fdatasync. This needs to happen or the file data would not
|
||||||
* happen or the file data would not necessarily hit the device synchronously,
|
* necessarily hit the device synchronously, even though the vfs inode has the
|
||||||
* even though the vfs inode has the O_SYNC flag set. Also, I_DIRTY_DATASYNC
|
* O_SYNC flag set. Also, I_DIRTY_DATASYNC simply "feels" better than just
|
||||||
* simply "feels" better than just I_DIRTY_SYNC, since the file data has not
|
* I_DIRTY_SYNC, since the file data has not actually hit the block device yet,
|
||||||
* actually hit the block device yet, which is not what I_DIRTY_SYNC on its own
|
* which is not what I_DIRTY_SYNC on its own would suggest.
|
||||||
* would suggest.
|
|
||||||
*/
|
*/
|
||||||
void __mark_mft_record_dirty(ntfs_inode *ni)
|
void __mark_mft_record_dirty(ntfs_inode *ni)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in a new issue