Subject: [merged] nbd-correct-disconnect-behavior.patch removed from -mm tree
To: paul.clements@xxxxxxxxxxxx,rob@xxxxxxxxxxx,stable@xxxxxxxxxxxxxxx,mm-commits@xxxxxxxxxxxxxxx
From: akpm@xxxxxxxxxxxxxxxxxxxx
Date: Mon, 08 Jul 2013 12:36:54 -0700
The patch titled
Subject: nbd: correct disconnect behavior
has been removed from the -mm tree. Its filename was
nbd-correct-disconnect-behavior.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Paul Clements <paul.clements@xxxxxxxxxxxx>
Subject: nbd: correct disconnect behavior
Currently, when a disconnect is requested by the user (via NBD_DISCONNECT
ioctl) the return from NBD_DO_IT is undefined (it is usually one of
several error codes). This means that nbd-client does not know if a
manual disconnect was performed or whether a network error occurred.
Because of this, nbd-client's persist mode (which tries to reconnect after
error, but not after manual disconnect) does not always work correctly.
This change fixes this by causing NBD_DO_IT to always return 0 if a user
requests a disconnect. This means that nbd-client can correctly either
persist the connection (if an error occurred) or disconnect (if the user
requested it).
Signed-off-by: Paul Clements <paul.clements@xxxxxxxxxxxx>
Acked-by: Rob Landley <rob@xxxxxxxxxxx>
Cc: <stable@xxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/block/nbd.c | 7 ++++++-
include/linux/nbd.h | 1 +
2 files changed, 7 insertions(+), 1 deletion(-)
diff -puN drivers/block/nbd.c~nbd-correct-disconnect-behavior drivers/block/nbd.c
--- a/drivers/block/nbd.c~nbd-correct-disconnect-behavior
+++ a/drivers/block/nbd.c
@@ -623,8 +623,10 @@ static int __nbd_ioctl(struct block_devi
if (!nbd->sock)
return -EINVAL;
+ nbd->disconnect = 1;
+
nbd_send_req(nbd, &sreq);
- return 0;
+ return 0;
}
case NBD_CLEAR_SOCK: {
@@ -654,6 +656,7 @@ static int __nbd_ioctl(struct block_devi
nbd->sock = SOCKET_I(inode);
if (max_part > 0)
bdev->bd_invalidated = 1;
+ nbd->disconnect = 0; /* we're connected now */
return 0;
} else {
fput(file);
@@ -743,6 +746,8 @@ static int __nbd_ioctl(struct block_devi
set_capacity(nbd->disk, 0);
if (max_part > 0)
ioctl_by_bdev(bdev, BLKRRPART, 0);
+ if (nbd->disconnect) /* user requested, ignore socket errors */
+ return 0;
return nbd->harderror;
}
diff -puN include/linux/nbd.h~nbd-correct-disconnect-behavior include/linux/nbd.h
--- a/include/linux/nbd.h~nbd-correct-disconnect-behavior
+++ a/include/linux/nbd.h
@@ -41,6 +41,7 @@ struct nbd_device {
u64 bytesize;
pid_t pid; /* pid of nbd-client, if attached */
int xmit_timeout;
+ int disconnect; /* a disconnect has been requested by user */
};
#endif
_
Patches currently in -mm which might be from paul.clements@xxxxxxxxxxxx are
origin.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html