From: akpm@linux-foundation.org Subject: [patch 2/3] md: dm-log: fix cn_ulog_callback declaration Date: Fri, 18 Sep 2009 12:45:08 -0700 Message-ID: <200909181945.n8IJj8rN010429@imap1.linux-foundation.org> Reply-To: device-mapper development Mime-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: quoted-printable Return-path: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dm-devel-bounces@redhat.com Errors-To: dm-devel-bounces@redhat.com To: agk@redhat.com Cc: dm-devel@redhat.com, davem@davemloft.net, vapier@gentoo.org, akpm@linux-foundation.org, jirislaby@gmail.com List-Id: dm-devel.ids From: Jiri Slaby The third parameter of cn_add_callback accepts functions with void *()(struct cn_msg *) prototype. Change cn_ulog_callback to match it by removing void * and adding struct cn_msg * directly. It's introduced by commit: connector: make callback argument type explicit Signed-off-by: Jiri Slaby Cc: Mike Frysinger Cc: David S. Miller Cc: Alasdair G Kergon Signed-off-by: Andrew Morton --- drivers/md/dm-log-userspace-transfer.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff -puN drivers/md/dm-log-userspace-transfer.c~md-dm-log-fix-cn_ulog_ca= llback-declaration drivers/md/dm-log-userspace-transfer.c --- a/drivers/md/dm-log-userspace-transfer.c~md-dm-log-fix-cn_ulog_callba= ck-declaration +++ a/drivers/md/dm-log-userspace-transfer.c @@ -129,9 +129,8 @@ static int fill_pkg(struct cn_msg *msg,=20 * This is the connector callback that delivers data * that was sent from userspace. */ -static void cn_ulog_callback(void *data) +static void cn_ulog_callback(struct cn_msg *msg) { - struct cn_msg *msg =3D (struct cn_msg *)data; struct dm_ulog_request *tfr =3D (struct dm_ulog_request *)(msg + 1); =20 spin_lock(&receiving_list_lock); _