* [PATCH] fs, ntfs: ķill the iov_iter_fault_in_multipages_readable alias
@ 2016-09-19 15:47 Christoph Hellwig
2016-09-19 16:47 ` Al Viro
0 siblings, 1 reply; 2+ messages in thread
From: Christoph Hellwig @ 2016-09-19 15:47 UTC (permalink / raw)
To: viro; +Cc: linux-fsdevel
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
fs/ntfs/file.c | 2 +-
include/linux/uio.h | 1 -
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/fs/ntfs/file.c b/fs/ntfs/file.c
index f548629..bf72a2c 100644
--- a/fs/ntfs/file.c
+++ b/fs/ntfs/file.c
@@ -1850,7 +1850,7 @@ again:
* pages being swapped out between us bringing them into memory
* and doing the actual copying.
*/
- if (unlikely(iov_iter_fault_in_multipages_readable(i, bytes))) {
+ if (unlikely(iov_iter_fault_in_readable(i, bytes))) {
status = -EFAULT;
break;
}
diff --git a/include/linux/uio.h b/include/linux/uio.h
index 75b4aaf..7709f8d 100644
--- a/include/linux/uio.h
+++ b/include/linux/uio.h
@@ -76,7 +76,6 @@ size_t iov_iter_copy_from_user_atomic(struct page *page,
struct iov_iter *i, unsigned long offset, size_t bytes);
void iov_iter_advance(struct iov_iter *i, size_t bytes);
int iov_iter_fault_in_readable(struct iov_iter *i, size_t bytes);
-#define iov_iter_fault_in_multipages_readable iov_iter_fault_in_readable
size_t iov_iter_single_seg_count(const struct iov_iter *i);
size_t copy_page_to_iter(struct page *page, size_t offset, size_t bytes,
struct iov_iter *i);
--
2.1.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] fs, ntfs: ķill the iov_iter_fault_in_multipages_readable alias
2016-09-19 15:47 [PATCH] fs, ntfs: ķill the iov_iter_fault_in_multipages_readable alias Christoph Hellwig
@ 2016-09-19 16:47 ` Al Viro
0 siblings, 0 replies; 2+ messages in thread
From: Al Viro @ 2016-09-19 16:47 UTC (permalink / raw)
To: Christoph Hellwig; +Cc: linux-fsdevel
On Mon, Sep 19, 2016 at 08:47:47AM -0700, Christoph Hellwig wrote:
Already in the local tree; hopefully I'll get the rat's nest of local branches
(some with still sensitive stuff) untangled by tomorrow, so I'll have -next
updated ;-/
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-09-19 16:47 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-09-19 15:47 [PATCH] fs, ntfs: ķill the iov_iter_fault_in_multipages_readable alias Christoph Hellwig
2016-09-19 16:47 ` Al Viro
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).