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

Commit fbf8fb76 authored by Jan Kara's avatar Jan Kara Committed by Al Viro
Browse files

ntfs: Convert to new freezing mechanism 



Move check in ntfs_file_aio_write_nolock() to ntfs_file_aio_write() and
use new freeze protection.

CC: linux-ntfs-dev@lists.sourceforge.net
CC: Anton Altaparmakov <anton@tuxera.com>
Signed-off-by: default avatarJan Kara <jack@suse.cz>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 58ef6a75

fs/ntfs/file.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -2084,7 +2084,6 @@ static ssize_t ntfs_file_aio_write_nolock(struct kiocb *iocb, 
	if (err)

	if (err)

		return err;

		return err;

	pos = *ppos;

	pos = *ppos;

	vfs_check_frozen(inode->i_sb, SB_FREEZE_WRITE);

	/* We can write back this queue in page reclaim. */

	/* We can write back this queue in page reclaim. */

	current->backing_dev_info = mapping->backing_dev_info;

	current->backing_dev_info = mapping->backing_dev_info;

	written = 0;

	written = 0;
@@ -2119,6 +2118,7 @@ static ssize_t ntfs_file_aio_write(struct kiocb *iocb, const struct iovec *iov, 




	BUG_ON(iocb->ki_pos != pos);

	BUG_ON(iocb->ki_pos != pos);





	sb_start_write(inode->i_sb);

	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);
@@ -2127,6 +2127,7 @@ static ssize_t ntfs_file_aio_write(struct kiocb *iocb, const struct iovec *iov, 
		if (err < 0)

		if (err < 0)

			ret = err;

			ret = err;

	}

	}

	sb_end_write(inode->i_sb);

	return ret;

	return ret;

}

}