Patchwork [net-next,5/6] net: use release_pages() in zerocopy_sg_from_iovec()

login
register
mail settings
Submitter Jason Wang
Date Aug. 6, 2013, 9:45 a.m.
Message ID <1375782308-10565-6-git-send-email-jasowang@redhat.com>
Download mbox | patch
Permalink /patch/264966/
State Accepted
Delegated to: David Miller
Headers show

Comments

Jason Wang - Aug. 6, 2013, 9:45 a.m.
To reduce the duplicated codes.

Signed-off-by: Jason Wang <jasowang@redhat.com>
---
 net/core/datagram.c |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

Patch

diff --git a/net/core/datagram.c b/net/core/datagram.c
index a8a795c..badcd93 100644
--- a/net/core/datagram.c
+++ b/net/core/datagram.c
@@ -48,6 +48,7 @@ 
 #include <linux/highmem.h>
 #include <linux/spinlock.h>
 #include <linux/slab.h>
+#include <linux/pagemap.h>
 
 #include <net/protocol.h>
 #include <linux/skbuff.h>
@@ -638,10 +639,7 @@  int zerocopy_sg_from_iovec(struct sk_buff *skb, const struct iovec *from,
 			return -EMSGSIZE;
 		num_pages = get_user_pages_fast(base, size, 0, &page[i]);
 		if (num_pages != size) {
-			int j;
-
-			for (j = 0; j < num_pages; j++)
-				put_page(page[i + j]);
+			release_pages(&page[i], num_pages, 0);
 			return -EFAULT;
 		}
 		truesize = size * PAGE_SIZE;