diff options
Diffstat (limited to 'drivers/staging/dst')
| -rw-r--r-- | drivers/staging/dst/dcore.c | 8 | ||||
| -rw-r--r-- | drivers/staging/dst/export.c | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/drivers/staging/dst/dcore.c b/drivers/staging/dst/dcore.c index fad25b753042..ac8577358ba0 100644 --- a/drivers/staging/dst/dcore.c +++ b/drivers/staging/dst/dcore.c @@ -112,8 +112,9 @@ static int dst_request(struct request_queue *q, struct bio *bio) * 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. + * for example, although later it was changed to + * bio_rw_flagged(bio, BIO_RW_DISCARD) only, which does not + * work in this case. */ //err = -EOPNOTSUPP; err = 0; @@ -846,10 +847,9 @@ static dst_command_func dst_commands[] = { /* * Configuration parser. */ -static void cn_dst_callback(void *data) +static void cn_dst_callback(struct cn_msg *msg) { struct dst_ctl *ctl; - struct cn_msg *msg = data; int err; struct dst_ctl_ack ack; struct dst_node *n = NULL, *tmp; diff --git a/drivers/staging/dst/export.c b/drivers/staging/dst/export.c index 80ae4ebe610a..4fbd848bd14f 100644 --- a/drivers/staging/dst/export.c +++ b/drivers/staging/dst/export.c @@ -159,7 +159,7 @@ static struct dst_state *dst_accept_client(struct dst_state *st) goto err_out_exit; new = dst_state_alloc(st->node); - if (!new) { + if (IS_ERR(new)) { err = -ENOMEM; goto err_out_release; } |