Received: by 2002:ac0:a5b6:0:0:0:0:0 with SMTP id m51-v6csp3894722imm; Mon, 4 Jun 2018 11:01:38 -0700 (PDT) X-Google-Smtp-Source: ADUXVKJJ3ihn+zcUtQRjeXKA/+MKpB+ZASun7wIB4TCQ6hx3+e/s7Qj4gBoAtyp3RM4rFL90EthU X-Received: by 2002:a63:6f8a:: with SMTP id k132-v6mr13826959pgc.153.1528135298633; Mon, 04 Jun 2018 11:01:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1528135298; cv=none; d=google.com; s=arc-20160816; b=ZHrUyB6SEfaohVuRM4ncF1zE69hbC72W8XaMJDxvGT/2qeWGzLBc0CMhRsjMYWrV0u kR1svTo7kDaGhSAwIWigZlD1OyxkTaVu3ucOcoC5wFkSAzHCFsTzusyjzXe1Pye69Reb O+T3mZS0UqKr2pYcPo3/T3aYUxbBXpV1Qs88bDUE6XI5YS/hDEnLqRjBnzs3rWIyBegm 0bOA99H9t6xbf2Eu10ZA9zLI8MFKqfx6+zKNwmjtCtd257vc/nJdFn64k3fzUU8Z4b1M LGZo56YzemBwtJGv9/fADoF76b6bWxKAifmrCTX/gUQfibkOt2tJW7cZkgavYTHDJ+t8 bfPA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :dkim-signature:arc-authentication-results; bh=FTI0Ez9mlAcv9Sokv2sBxSxRmoMBBZC4p/q6MFTuJpw=; b=TFeWmJ9xqMENlU88e6ngs9RHfbAY+U+h7/M1JwLYwwWmQ6B/FjYst8glr/BM9qAt+W BM7c8/L2V5+7phHRwyn0Sg0u4roVQIhWkjao3wLCzBvVM0/rNddaueJ0E81FCRdFK6Na 8kqckrxCdkNF2W0Idi/q3wFq8gODxC9lQIfgfXzGrD4aT52bGda9u+govfuAzvU3EfuZ nUHmuuupxQYYtfAdsnhjUhJh6MpG5qLGDDjMY6NqhWtPc04S+gSEU1djWnHuqLX/a7vm pR4t+lP82pXOLBnNrxWv89qOaq6CAb8pNBBjKKuVgYTLgX+GYvHVEPNBdiiODsYLgaP/ kBRA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@wdc.com header.s=dkim.wdc.com header.b=lWGnTLBq; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 203-v6si48630868pfc.21.2018.06.04.11.01.22; Mon, 04 Jun 2018 11:01:38 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=fail header.i=@wdc.com header.s=dkim.wdc.com header.b=lWGnTLBq; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751770AbeFDSAE (ORCPT + 99 others); Mon, 4 Jun 2018 14:00:04 -0400 Received: from esa3.hgst.iphmx.com ([216.71.153.141]:37520 "EHLO esa3.hgst.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751467AbeFDSAC (ORCPT ); Mon, 4 Jun 2018 14:00:02 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1528135202; x=1559671202; h=from:to:cc:subject:date:message-id; bh=OoYAAimdbS9PwCNjKmRUrlbpUnKlkEzO0TTGvrqlfC4=; b=lWGnTLBqbjZVTkF3yb7p8L9JMJoNXdftU/1k8JHSJTQEHqLCHtWrg/k+ EE4O9EAT/MP4EDmBD0JktPFJXA54keO/HqFR+tbxIb+Sfqu3XknfNTmkS 3M+m4uI3GkutbzUNkuclInQ4lFQ1j5GTp7rCFlVs390D4Az/7WtnmRIcY 6rvyw4cdSWEmKLBxhaz0NVsfFqgLe+wkRG+S/lPebWh5rIygEUbQlNtz4 aCt+Bk1PvV4y25nDQ0FbxuALw9MZDAfXcW3ER4nY+Y0J6fiDV6G7eFWbn aVCv8l4Qnh0ekIGNxVneoyXNIJqYovPMvDZeDamAvU3MsONc1FLnRf0rY Q==; X-IronPort-AV: E=Sophos;i="5.49,476,1520870400"; d="scan'208";a="81550572" Received: from uls-op-cesaip02.wdc.com (HELO uls-op-cesaep02.wdc.com) ([199.255.45.15]) by ob1.hgst.iphmx.com with ESMTP; 05 Jun 2018 02:00:01 +0800 Received: from uls-op-cesaip02.wdc.com ([10.248.3.37]) by uls-op-cesaep02.wdc.com with ESMTP; 04 Jun 2018 10:50:04 -0700 Received: from penguito-adamm.sdcorp.global.sandisk.com ([10.11.47.13]) by uls-op-cesaip02.wdc.com with ESMTP; 04 Jun 2018 11:00:01 -0700 From: adam.manzanares@wdc.com To: viro@zeniv.linux.org.uk, linux-fsdevel@vger.kernel.org Cc: axboe@kernel.dk, bcrl@kvack.org, mingo@kernel.org, tglx@linutronix.de, kstewart@linuxfoundation.org, peterz@infradead.org, pombredanne@nexb.com, gregkh@linuxfoundation.org, bigeasy@linutronix.de, rgoldwyn@suse.com, linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, linux-aio@kvack.org, linux-api@vger.kernel.org, hch@infradread.org, jmoyer@redhat.com, willy@infradead.org, smfrench@gmail.com, Adam Manzanares Subject: [PATCH 1/2] fs: aio ioprio add explicit block layer dependence Date: Mon, 4 Jun 2018 10:59:56 -0700 Message-Id: <20180604175957.2647-1-adam.manzanares@wdc.com> X-Mailer: git-send-email 2.17.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Adam Manzanares Previously, the ioprio_check_cap function was only defined when CONFIG_BLOCK was set. Make this relationship explicit and add a stub for !CONFIG_BLOCK. Signed-off-by: Adam Manzanares --- include/linux/ioprio.h | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/include/linux/ioprio.h b/include/linux/ioprio.h index 4a28cec49ec3..9e30ed6443db 100644 --- a/include/linux/ioprio.h +++ b/include/linux/ioprio.h @@ -77,6 +77,13 @@ extern int ioprio_best(unsigned short aprio, unsigned short bprio); extern int set_task_ioprio(struct task_struct *task, int ioprio); +#ifdef CONFIG_BLOCK extern int ioprio_check_cap(int ioprio); +#else +static inline int ioprio_check_cap(int ioprio) +{ + return -ENOTBLK; +} +#endif /* CONFIG_BLOCK */ #endif -- 2.17.0