From 1310492a40c5c40a5d5ee6df861d5287afa3198c Mon Sep 17 00:00:00 2001
From: Frank Munzert <munzert@de.ibm.com>
Date: Fri, 27 Jul 2007 12:29:17 +0200
Subject: [PATCH] --- yaml --- r: 63101 b: refs/heads/master c:
 2b3d8c9e06392d5539aa5d652f3a3c385fd19333 h: refs/heads/master i:   63099:
 3060b5d5ffa8dadc9fbd7f32aeae5b27403ea1ae v: v3

---
 [refs]                         | 2 +-
 trunk/drivers/s390/char/vmur.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 62b1232aced3..9082f0f474c2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7a8e0c8d9af43c9dfc62a8b2b9cc0484f48f7da4
+refs/heads/master: 2b3d8c9e06392d5539aa5d652f3a3c385fd19333
diff --git a/trunk/drivers/s390/char/vmur.c b/trunk/drivers/s390/char/vmur.c
index e90b0f846195..161867cebd8c 100644
--- a/trunk/drivers/s390/char/vmur.c
+++ b/trunk/drivers/s390/char/vmur.c
@@ -486,7 +486,7 @@ static ssize_t diag14_read(struct file *file, char __user *ubuf, size_t count,
 		}
 		if (rc)
 			goto fail;
-		if (reclen)
+		if (reclen && (copied == 0) && (*offs < PAGE_SIZE))
 			*((u16 *) &buf[FILE_RECLEN_OFFSET]) = reclen;
 		len = min(count - copied, PAGE_SIZE - res);
 		if (copy_to_user(ubuf + copied, buf + res, len)) {