ocfs2_file_aio_write(): switch to generic_perform_write()

Al Viro · Al Viro · commit 58bfab395b30 · 2014-04-01T23:19:37.000-04:00
Signed-off-by: Al Viro &lt;viro@zeniv.linux.org.uk&gt;
diff --git a/fs/ocfs2/file.c b/fs/ocfs2/file.c
@@ -2381,9 +2381,12 @@ static ssize_t ocfs2_file_aio_write(struct kiocb *iocb,
 			goto out_dio;
 		}
 	} else {
+		struct iov_iter from;
+		iov_iter_init(&from, iov, nr_segs, count, 0);
 		current->backing_dev_info = file->f_mapping->backing_dev_info;
-		written = generic_file_buffered_write(iocb, iov, nr_segs, *ppos,
-						      count, 0);
+		written = generic_perform_write(file, &from, *ppos);
+		if (likely(written >= 0))
+			iocb->ki_pos = *ppos + written;
 		current->backing_dev_info = NULL;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -2381,9 +2381,12 @@ static ssize_t ocfs2_file_aio_write(struct kiocb *iocb,`
`2381`	`2381`	`goto out_dio;`
`2382`	`2382`	`}`
`2383`	`2383`	`} else {`
	`2384`	`+ struct iov_iter from;`
	`2385`	`+ iov_iter_init(&from, iov, nr_segs, count, 0);`
`2384`	`2386`	`current->backing_dev_info = file->f_mapping->backing_dev_info;`
`2385`		`- written = generic_file_buffered_write(iocb, iov, nr_segs, *ppos,`
`2386`		`- count, 0);`
	`2387`	`+ written = generic_perform_write(file, &from, *ppos);`
	`2388`	`+ if (likely(written >= 0))`
	`2389`	`+ iocb->ki_pos = *ppos + written;`
`2387`	`2390`	`current->backing_dev_info = NULL;`
`2388`	`2391`	`}`
`2389`	`2392`