aboutsummaryrefslogtreecommitdiff
path: root/drivers/staging/dst
diff options
context:
space:
mode:
authorEvgeniy Polyakov <zbr@ioremap.net>2009-01-19 20:20:37 +0300
committerGreg Kroah-Hartman <gregkh@suse.de>2009-04-03 14:53:33 -0700
commit30c7c1c63079e97582a592c176bebbfd38285480 (patch)
treec17704559a7745c74f648a6f732d4a24c09d9fc9 /drivers/staging/dst
parente55b689268391a3b0a0d20c951b60b2d88a5e105 (diff)
Staging: DST: Do not allow empty barriers.
Do not allow empty barriers or generic_make_request() -> scsi_setup_fs_cmnd() will explode Signed-off-by: Evgeniy Polyakov <zbr@ioremap.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/dst')
-rw-r--r--drivers/staging/dst/dcore.c23
1 files changed, 23 insertions, 0 deletions
diff --git a/drivers/staging/dst/dcore.c b/drivers/staging/dst/dcore.c
index a72181f86e3..fad25b75304 100644
--- a/drivers/staging/dst/dcore.c
+++ b/drivers/staging/dst/dcore.c
@@ -100,10 +100,33 @@ static void dst_node_set_size(struct dst_node *n)
static int dst_request(struct request_queue *q, struct bio *bio)
{
struct dst_node *n = q->queuedata;
+ int err = -EIO;
+
+ if (bio_empty_barrier(bio) && !q->prepare_discard_fn) {
+ /*
+ * This is a dirty^Wnice hack, but if we complete this
+ * operation with -EOPNOTSUPP like intended, XFS
+ * will stuck and freeze the machine. This may be
+ * not particulary XFS problem though, but it is the
+ * only FS which sends empty barrier at umount time
+ * I worked with.
+ *
+ * Empty barriers are not allowed anyway, see 51fd77bd9f512
+ * for example, although later it was changed to bio_discard()
+ * only, which does not work in this case.
+ */
+ //err = -EOPNOTSUPP;
+ err = 0;
+ goto end_io;
+ }
bio_get(bio);
return dst_process_bio(n, bio);
+
+end_io:
+ bio_endio(bio, err);
+ return err;
}
/*