- xen-add-xenfs-to-allow-usermode-xen-interaction-fix-xenbus-message-reads.patch removed from -mm tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



The patch titled
     xen/xenfs: fix xenbus message reads
has been removed from the -mm tree.  Its filename was
     xen-add-xenfs-to-allow-usermode-xen-interaction-fix-xenbus-message-reads.patch

This patch was dropped because it was folded into xen-add-xenfs-to-allow-usermode-xen-interaction.patch

The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/

------------------------------------------------------
Subject: xen/xenfs: fix xenbus message reads
From: Jeremy Fitzhardinge <jeremy@xxxxxxxx>

Compute the remaining data size properly.

Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@xxxxxxxxxx>
Cc: Alex Zeffertt <alex.zeffertt@xxxxxxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---

 drivers/xen/xenfs/xenbus.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff -puN drivers/xen/xenfs/xenbus.c~xen-add-xenfs-to-allow-usermode-xen-interaction-fix-xenbus-message-reads drivers/xen/xenfs/xenbus.c
--- a/drivers/xen/xenfs/xenbus.c~xen-add-xenfs-to-allow-usermode-xen-interaction-fix-xenbus-message-reads
+++ a/drivers/xen/xenfs/xenbus.c
@@ -132,7 +132,7 @@ static ssize_t xenbus_file_read(struct f
 	rb = list_entry(u->read_buffers.next, struct read_buffer, list);
 	i = 0;
 	while (i < len) {
-		unsigned sz = min((unsigned)len - i, rb->cons - rb->len);
+		unsigned sz = min((unsigned)len - i, rb->len - rb->cons);
 
 		ret = copy_to_user(ubuf + i, &rb->msg[rb->cons], sz);
 
_

Patches currently in -mm which might be from jeremy@xxxxxxxx are

origin.patch
drivers-xen-xenbus-xenbus_clientc-cleanup-kerneldoc.patch
xen-add-xenfs-to-allow-usermode-xen-interaction.patch
xen-add-xenfs-to-allow-usermode-xen-interaction-fix-xenbus-message-reads.patch

--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Kernel Newbies FAQ]     [Kernel Archive]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [Bugtraq]     [Photo]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]

  Powered by Linux