From patchwork Thu Feb 27 21:10:44 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Simmons X-Patchwork-Id: 11409989 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 8D8571580 for ; Thu, 27 Feb 2020 21:27:20 +0000 (UTC) Received: from pdx1-mailman02.dreamhost.com (pdx1-mailman02.dreamhost.com [64.90.62.194]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 765CB246A0 for ; Thu, 27 Feb 2020 21:27:20 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 765CB246A0 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=infradead.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lustre-devel-bounces@lists.lustre.org Received: from pdx1-mailman02.dreamhost.com (localhost [IPv6:::1]) by pdx1-mailman02.dreamhost.com (Postfix) with ESMTP id 78B9A21FF61; Thu, 27 Feb 2020 13:24:05 -0800 (PST) X-Original-To: lustre-devel@lists.lustre.org Delivered-To: lustre-devel-lustre.org@pdx1-mailman02.dreamhost.com Received: from smtp3.ccs.ornl.gov (smtp3.ccs.ornl.gov [160.91.203.39]) by pdx1-mailman02.dreamhost.com (Postfix) with ESMTP id 8234321FC35 for ; Thu, 27 Feb 2020 13:19:11 -0800 (PST) Received: from star.ccs.ornl.gov (star.ccs.ornl.gov [160.91.202.134]) by smtp3.ccs.ornl.gov (Postfix) with ESMTP id 5A04F2482; Thu, 27 Feb 2020 16:18:15 -0500 (EST) Received: by star.ccs.ornl.gov (Postfix, from userid 2004) id 5892046D; Thu, 27 Feb 2020 16:18:15 -0500 (EST) From: James Simmons To: Andreas Dilger , Oleg Drokin , NeilBrown Date: Thu, 27 Feb 2020 16:10:44 -0500 Message-Id: <1582838290-17243-177-git-send-email-jsimmons@infradead.org> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1582838290-17243-1-git-send-email-jsimmons@infradead.org> References: <1582838290-17243-1-git-send-email-jsimmons@infradead.org> Subject: [lustre-devel] [PATCH 176/622] lustre: uapi: fix warnings when lustre_user.h included X-BeenThere: lustre-devel@lists.lustre.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "For discussing Lustre software development." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Lustre Development List MIME-Version: 1.0 Errors-To: lustre-devel-bounces@lists.lustre.org Sender: "lustre-devel" From: Andreas Dilger Checking for lustre/lustre_user.h in a configure script generates a warning because of the included checking lustre/lustre_user.h usability... no checking lustre/lustre_user.h presence... yes WARNING: present but cannot be compiled WARNING: check for missing prerequisite headers? WARNING: see the Autoconf documentation WARNING: section "Present But Cannot Be Compiled" WARNING: proceeding with the preprocessor's result WARNING: in the future, the compiler will take precedence Looking into config.log it shows: In file included from /usr/include/lustre/lustre_user.h:59, from conftest.c:91: /usr/include/sys/quota.h:221: error: expected declaration specifiers or '...' before 'caddr_t' Since we don't really need much from the header, just use the default linux UAPI quota header. Fix an unused variable warning in ll_dir_ioctl(). Lustre-commit: db0592145574 ("LU-11783 utils: fix warnings when lustre_user.h included") Signed-off-by: Andreas Dilger Reviewed-on: https://review.whamcloud.com/33876 Reviewed-by: Wang Shilong Reviewed-by: James Simmons Reviewed-by: Oleg Drokin Signed-off-by: James Simmons --- fs/lustre/llite/dir.c | 2 +- include/uapi/linux/lustre/lustre_user.h | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/fs/lustre/llite/dir.c b/fs/lustre/llite/dir.c index f54987a..ef4fa36 100644 --- a/fs/lustre/llite/dir.c +++ b/fs/lustre/llite/dir.c @@ -1356,7 +1356,7 @@ static long ll_dir_ioctl(struct file *file, unsigned int cmd, unsigned long arg) struct lov_user_md_v1 *lumv1_ptr = &lumv1; struct lov_user_md_v1 __user *lumv1p = (void __user *)arg; struct lov_user_md_v3 __user *lumv3p = (void __user *)arg; - int lum_size; + int lum_size = 0; int set_default = 0; diff --git a/include/uapi/linux/lustre/lustre_user.h b/include/uapi/linux/lustre/lustre_user.h index 3bd6fc7..649aeeb 100644 --- a/include/uapi/linux/lustre/lustre_user.h +++ b/include/uapi/linux/lustre/lustre_user.h @@ -44,10 +44,10 @@ #include #include +#include #ifdef __KERNEL__ # include -# include # include # include /* snprintf() */ # include @@ -57,7 +57,6 @@ # include # include /* snprintf() */ # include -# include # include #endif /* __KERNEL__ */ #include