diff options
author | Kent Overstreet <koverstreet@google.com> | 2013-05-09 18:03:42 -0400 |
---|---|---|
committer | Benjamin LaHaise <bcrl@kvack.org> | 2013-07-30 11:53:12 -0400 |
commit | 73a7075e3f6ec63dc359064eea6fd84f406cf2a5 (patch) | |
tree | 23a85d1f72746340b15636627a00f1e0346eb74b /fs/ocfs2 | |
parent | 5ffac122dbda89fbb29885f35a5d47b0edb8936d (diff) |
aio: Kill aio_rw_vect_retry()
This code doesn't serve any purpose anymore, since the aio retry
infrastructure has been removed.
This change should be safe because aio_read/write are also used for
synchronous IO, and called from do_sync_read()/do_sync_write() - and
there's no looping done in the sync case (the read and write syscalls).
Signed-off-by: Kent Overstreet <koverstreet@google.com>
Cc: Zach Brown <zab@redhat.com>
Cc: Felipe Balbi <balbi@ti.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Mark Fasheh <mfasheh@suse.com>
Cc: Joel Becker <jlbec@evilplan.org>
Cc: Rusty Russell <rusty@rustcorp.com.au>
Cc: Jens Axboe <axboe@kernel.dk>
Cc: Asai Thambi S P <asamymuthupa@micron.com>
Cc: Selvan Mani <smani@micron.com>
Cc: Sam Bradshaw <sbradshaw@micron.com>
Cc: Jeff Moyer <jmoyer@redhat.com>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Benjamin LaHaise <bcrl@kvack.org>
Signed-off-by: Benjamin LaHaise <bcrl@kvack.org>
Diffstat (limited to 'fs/ocfs2')
-rw-r--r-- | fs/ocfs2/file.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/ocfs2/file.c b/fs/ocfs2/file.c index 41000f223ca4..dd1a4901a54b 100644 --- a/fs/ocfs2/file.c +++ b/fs/ocfs2/file.c | |||
@@ -2245,7 +2245,7 @@ static ssize_t ocfs2_file_aio_write(struct kiocb *iocb, | |||
2245 | file->f_path.dentry->d_name.name, | 2245 | file->f_path.dentry->d_name.name, |
2246 | (unsigned int)nr_segs); | 2246 | (unsigned int)nr_segs); |
2247 | 2247 | ||
2248 | if (iocb->ki_left == 0) | 2248 | if (iocb->ki_nbytes == 0) |
2249 | return 0; | 2249 | return 0; |
2250 | 2250 | ||
2251 | appending = file->f_flags & O_APPEND ? 1 : 0; | 2251 | appending = file->f_flags & O_APPEND ? 1 : 0; |
@@ -2296,7 +2296,7 @@ relock: | |||
2296 | 2296 | ||
2297 | can_do_direct = direct_io; | 2297 | can_do_direct = direct_io; |
2298 | ret = ocfs2_prepare_inode_for_write(file, ppos, | 2298 | ret = ocfs2_prepare_inode_for_write(file, ppos, |
2299 | iocb->ki_left, appending, | 2299 | iocb->ki_nbytes, appending, |
2300 | &can_do_direct, &has_refcount); | 2300 | &can_do_direct, &has_refcount); |
2301 | if (ret < 0) { | 2301 | if (ret < 0) { |
2302 | mlog_errno(ret); | 2302 | mlog_errno(ret); |
@@ -2304,7 +2304,7 @@ relock: | |||
2304 | } | 2304 | } |
2305 | 2305 | ||
2306 | if (direct_io && !is_sync_kiocb(iocb)) | 2306 | if (direct_io && !is_sync_kiocb(iocb)) |
2307 | unaligned_dio = ocfs2_is_io_unaligned(inode, iocb->ki_left, | 2307 | unaligned_dio = ocfs2_is_io_unaligned(inode, iocb->ki_nbytes, |
2308 | *ppos); | 2308 | *ppos); |
2309 | 2309 | ||
2310 | /* | 2310 | /* |