diff options
author | Jan Kara <jack@suse.cz> | 2012-06-12 10:20:43 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2012-07-31 01:45:51 -0400 |
commit | fbf8fb76505a9e5bbb47e91d964105b6ea59b0ec (patch) | |
tree | 6179839a08c12657ed22c93d7733458ff201d98f /fs/ntfs | |
parent | 58ef6a75c38e9faa7d19bb7d7b45fe0df02e8621 (diff) |
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: Jan Kara <jack@suse.cz>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/ntfs')
-rw-r--r-- | fs/ntfs/file.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/ntfs/file.c b/fs/ntfs/file.c index 7389d2d5e51d..1ecf46448f85 100644 --- a/fs/ntfs/file.c +++ b/fs/ntfs/file.c | |||
@@ -2084,7 +2084,6 @@ static ssize_t ntfs_file_aio_write_nolock(struct kiocb *iocb, | |||
2084 | if (err) | 2084 | if (err) |
2085 | return err; | 2085 | return err; |
2086 | pos = *ppos; | 2086 | pos = *ppos; |
2087 | vfs_check_frozen(inode->i_sb, SB_FREEZE_WRITE); | ||
2088 | /* We can write back this queue in page reclaim. */ | 2087 | /* We can write back this queue in page reclaim. */ |
2089 | current->backing_dev_info = mapping->backing_dev_info; | 2088 | current->backing_dev_info = mapping->backing_dev_info; |
2090 | written = 0; | 2089 | written = 0; |
@@ -2119,6 +2118,7 @@ static ssize_t ntfs_file_aio_write(struct kiocb *iocb, const struct iovec *iov, | |||
2119 | 2118 | ||
2120 | BUG_ON(iocb->ki_pos != pos); | 2119 | BUG_ON(iocb->ki_pos != pos); |
2121 | 2120 | ||
2121 | sb_start_write(inode->i_sb); | ||
2122 | mutex_lock(&inode->i_mutex); | 2122 | mutex_lock(&inode->i_mutex); |
2123 | ret = ntfs_file_aio_write_nolock(iocb, iov, nr_segs, &iocb->ki_pos); | 2123 | ret = ntfs_file_aio_write_nolock(iocb, iov, nr_segs, &iocb->ki_pos); |
2124 | mutex_unlock(&inode->i_mutex); | 2124 | mutex_unlock(&inode->i_mutex); |
@@ -2127,6 +2127,7 @@ static ssize_t ntfs_file_aio_write(struct kiocb *iocb, const struct iovec *iov, | |||
2127 | if (err < 0) | 2127 | if (err < 0) |
2128 | ret = err; | 2128 | ret = err; |
2129 | } | 2129 | } |
2130 | sb_end_write(inode->i_sb); | ||
2130 | return ret; | 2131 | return ret; |
2131 | } | 2132 | } |
2132 | 2133 | ||