From 3e860b740657c2d4d37e24e64bfa3d9cfc7a3c77 Mon Sep 17 00:00:00 2001
From: Jens Axboe <jens.axboe@oracle.com>
Date: Fri, 15 Jun 2007 13:14:22 +0200
Subject: [PATCH] --- yaml --- r: 57788 b: refs/heads/master c:
 00de00bdad278783b3664ad2969954a707f5944a h: refs/heads/master v: v3

---
 [refs]            | 2 +-
 trunk/fs/splice.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index a0f9f34f3411..670b86b04916 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 17ee4f49ab2c802c7818fa71c4e7e351a7230b86
+refs/heads/master: 00de00bdad278783b3664ad2969954a707f5944a
diff --git a/trunk/fs/splice.c b/trunk/fs/splice.c
index 12d247f6ece5..186fad463c43 100644
--- a/trunk/fs/splice.c
+++ b/trunk/fs/splice.c
@@ -176,6 +176,7 @@ static const struct pipe_buf_operations user_page_pipe_buf_ops = {
 static ssize_t splice_to_pipe(struct pipe_inode_info *pipe,
 			      struct splice_pipe_desc *spd)
 {
+	unsigned int spd_pages = spd->nr_pages;
 	int ret, do_wakeup, page_nr;
 
 	ret = 0;
@@ -254,7 +255,7 @@ static ssize_t splice_to_pipe(struct pipe_inode_info *pipe,
 		kill_fasync(&pipe->fasync_readers, SIGIO, POLL_IN);
 	}
 
-	while (page_nr < spd->nr_pages)
+	while (page_nr < spd_pages)
 		page_cache_release(spd->pages[page_nr++]);
 
 	return ret;