From patchwork Fri Jan 22 18:14:39 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guenter Roeck X-Patchwork-Id: 8091651 Return-Path: X-Original-To: patchwork-linux-fsdevel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 115BB9F859 for ; Fri, 22 Jan 2016 18:14:57 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 47C572046F for ; Fri, 22 Jan 2016 18:14:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6B9C3202FF for ; Fri, 22 Jan 2016 18:14:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754722AbcAVSOr (ORCPT ); Fri, 22 Jan 2016 13:14:47 -0500 Received: from bh-25.webhostbox.net ([208.91.199.152]:45937 "EHLO bh-25.webhostbox.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754582AbcAVSOq (ORCPT ); Fri, 22 Jan 2016 13:14:46 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=roeck-us.net; s=default; h=Message-Id:Date:Subject:Cc:To:From; bh=R8skEedfV0iOhbNVisvrHQ8hkqw0by1DNtXyAg/nibo=; b=Lp5guLbBYYPWoo3YAlK4JccAP+ abYo78+okQ+/hz0iIY0WGghyR3oGsrsIGm+vVKe48H/fBSKTX90fw7z5wnqkhYu4MsPhlpV9hSKrH XuSunW43mzzgKro6svDeOsLANK7cUtG9cvair2UycSlMWsnBjP4y8Wmz8XU1pG7iyC0sf/uHn8+3C dW/6wrIoboJEtjnOSS3Mmc2HQjByKZLekjMIKfDEtXVpglTK0Vk/kMcm8nvvpCXGmOhS7IHF2aXBW 0Xix1oM9pZV1jsXa/HAf1lhy1hcY7pVKBKcwcaZLPqyVilJrpv7I9y4u8XuK6wpZ/F+0aHkgPN9Py 4Kkoc2pQ==; Received: from 108-223-40-66.lightspeed.sntcca.sbcglobal.net ([108.223.40.66]:57041 helo=localhost) by bh-25.webhostbox.net with esmtpa (Exim 4.86) (envelope-from ) id 1aMgEO-000cjO-QQ; Fri, 22 Jan 2016 18:14:45 +0000 From: Guenter Roeck To: Alexander Viro Cc: linux-fsdevel@vger.kernel.org, linux-aio@kvack.org, linux-kernel@vger.kernel.org, kernel-testers@vger.kernel.org, Guenter Roeck , Benjamin LaHaise Subject: [PATCH -next] aio: Fix compile error due to unexpected use of cmpxchg() Date: Fri, 22 Jan 2016 10:14:39 -0800 Message-Id: <1453486479-19347-1-git-send-email-linux@roeck-us.net> X-Mailer: git-send-email 2.1.4 X-Authenticated_sender: guenter@roeck-us.net X-OutGoing-Spam-Status: No, score=-1.0 X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - bh-25.webhostbox.net X-AntiAbuse: Original Domain - vger.kernel.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - roeck-us.net X-Get-Message-Sender-Via: bh-25.webhostbox.net: authenticated_id: guenter@roeck-us.net X-Authenticated-Sender: bh-25.webhostbox.net: guenter@roeck-us.net X-Source: X-Source-Args: X-Source-Dir: Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP cmpxchg() on some architectures (ia64) doesn't like functions as parameters. This results in the following compile error on the affected architectures. fs/aio.c: In function 'aio_thread_fn': fs/aio.c:1499:1: error: cast specifies function type Fixes: 6a81013efc40 ("aio: add support for IOCB_CMD_POLL via aio thread helper") Cc: Benjamin LaHaise Signed-off-by: Guenter Roeck --- No idea if this is the correct or an acceptable fix. If not, please consider this to be a bug report. fs/aio.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fs/aio.c b/fs/aio.c index 56bcdf4105f4..229a91e391df 100644 --- a/fs/aio.c +++ b/fs/aio.c @@ -1495,8 +1495,8 @@ static void aio_thread_fn(struct work_struct *work) * cancellation if it has not already occurred. */ old_cancel = cmpxchg(&iocb->ki_cancel, - aio_thread_queue_iocb_cancel_early, - aio_thread_queue_iocb_cancel); + (kiocb_cancel_fn *)aio_thread_queue_iocb_cancel_early, + (kiocb_cancel_fn *)aio_thread_queue_iocb_cancel); if (old_cancel != KIOCB_CANCELLED) ret = iocb->ki_work_fn(iocb); else