Skip to contentSkip to conversation

fs, ntfs: ķill the iov_iter_fault_in_multipages_readable alias

PATCH In review Christoph Hellwig 2 participants 2 messages Sep 19, 2016

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 fs, ntfs: ķill the iov_iter_fault_in_multipages_readable alias

---
 fs/ntfs/file.c      | 2 +-
 include/linux/uio.h | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)
fs/ntfs/file.c +1 -1
index f548629..bf72a2c 100644
@@ -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;
 		}
include/linux/uio.h +0 -1
index 75b4aaf..7709f8d 100644
@@ -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);
Signature · 1 line
2.1.4
maintainer
#1 lore raw

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 ;-/