From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5E15EC282D0 for ; Tue, 29 Jan 2019 06:47:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 287D1217F5 for ; Tue, 29 Jan 2019 06:47:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726977AbfA2GrP (ORCPT ); Tue, 29 Jan 2019 01:47:15 -0500 Received: from outbound.smtp.vt.edu ([198.82.183.121]:44108 "EHLO omr1.cc.vt.edu" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1725795AbfA2GrP (ORCPT ); Tue, 29 Jan 2019 01:47:15 -0500 Received: from mr6.cc.vt.edu (mr6.cc.vt.edu [IPv6:2607:b400:92:8500:0:af:2d00:4488]) by omr1.cc.vt.edu (8.14.4/8.14.4) with ESMTP id x0T6lD4P013723 for ; Tue, 29 Jan 2019 01:47:13 -0500 Received: from mail-qk1-f197.google.com (mail-qk1-f197.google.com [209.85.222.197]) by mr6.cc.vt.edu (8.14.7/8.14.7) with ESMTP id x0T6l80Y020675 for ; Tue, 29 Jan 2019 01:47:13 -0500 Received: by mail-qk1-f197.google.com with SMTP id s14so20765390qkl.16 for ; Mon, 28 Jan 2019 22:47:13 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:mime-version:date:message-id; bh=WZ49e+wOO/wtFvBaOgf7zukaRUZflpYPsjy82W11Klw=; b=s9tDdYR7aEsTxf8GguS9+q3bxeqHfXfG86qRv+uC834hBM7+oZef2YQAqXaxWBo3mI yic8B1vBTyF0kyOXwY/Oes0FXzYfMhhC2q1CM8kSMX5RUlEkQ15JYiFJdsG5cvtAmr+l nBKcuYZyipDLiTeQMpPVJLD3RzNfF4CaQ+OAwjNVoMosQInxUpS7PUzkSXkcO/Wrxiq3 24WK7G9q2ZVAJGanQN1vLxM26F5hB6GJhZGlvDXD48bBAkTqH8m6WzdM/LrQ8CqYEpWP rpXxh3Jh7ocMfoQC6JllZPCehOwfbH3r6xHVqbYqukUbtrJtjqVNigKHAl8m3rFDQOdv IElw== X-Gm-Message-State: AJcUukcsNH9jO2lT9bvgJEk5Xg4762rhcxKzQuBpf+V2g38y0MqfcJ1p gzZY/c1FKsDcaremefb9aLNpXo6KOKEMxCfHpvR9e9Rbezu6TxyHGbwEGYkT631DThDkuk3kL9A e56MUAVsRc4qeFstAMQME3HU8Yag= X-Received: by 2002:ac8:b0e:: with SMTP id e14mr25044105qti.336.1548744428642; Mon, 28 Jan 2019 22:47:08 -0800 (PST) X-Google-Smtp-Source: ALg8bN5uTqvDGtpsIQDBn0Cf36InlGDtjH/7RpMcRpyptlvlnus0MpL2+c/cJILEkZM9o6L60Nm6FQ== X-Received: by 2002:ac8:b0e:: with SMTP id e14mr25044098qti.336.1548744428478; Mon, 28 Jan 2019 22:47:08 -0800 (PST) Received: from turing-police.cc.vt.edu ([2601:5c0:c001:4341::936]) by smtp.gmail.com with ESMTPSA id c11sm67954413qtn.95.2019.01.28.22.47.07 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 28 Jan 2019 22:47:07 -0800 (PST) X-Mailer: exmh version 2.9.0 11/07/2018 with nmh-1.7+dev From: valdis.kletnieks@vt.edu To: Alexei Starovoitov , Daniel Borkmann cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] kernel/bpf/cgroup.c - clean up kerneldoc warnings Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Tue, 29 Jan 2019 01:47:06 -0500 Message-ID: <10746.1548744426@turing-police.cc.vt.edu> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Building with W=1 reveals some bitrot CC kernel/bpf/cgroup.o kernel/bpf/cgroup.c:238: warning: Function parameter or member 'flags' not described in '__cgroup_bpf_attach' kernel/bpf/cgroup.c:367: warning: Function parameter or member 'unused_flags' not described in '__cgroup_bpf_detach' Add a kerneldoc line for 'flags'. Fixing the warning for 'unused_flags' is best approached by removing the unused parameter on the function call. Signed-off-by: Valdis Kletnieks diff --git a/include/linux/bpf-cgroup.h b/include/linux/bpf-cgroup.h index 588dd5f0bd85..695b2a880d9a 100644 --- a/include/linux/bpf-cgroup.h +++ b/include/linux/bpf-cgroup.h @@ -78,7 +78,7 @@ int cgroup_bpf_inherit(struct cgroup *cgrp); int __cgroup_bpf_attach(struct cgroup *cgrp, struct bpf_prog *prog, enum bpf_attach_type type, u32 flags); int __cgroup_bpf_detach(struct cgroup *cgrp, struct bpf_prog *prog, - enum bpf_attach_type type, u32 flags); + enum bpf_attach_type type); int __cgroup_bpf_query(struct cgroup *cgrp, const union bpf_attr *attr, union bpf_attr __user *uattr); diff --git a/kernel/bpf/cgroup.c b/kernel/bpf/cgroup.c index ab612fe9862f..d78cfec5807d 100644 --- a/kernel/bpf/cgroup.c +++ b/kernel/bpf/cgroup.c @@ -230,6 +230,7 @@ static int update_effective_progs(struct cgroup *cgrp, * @cgrp: The cgroup which descendants to traverse * @prog: A program to attach * @type: Type of attach operation + * @flags: Option flags * * Must be called with cgroup_mutex held. */ @@ -363,7 +364,7 @@ int __cgroup_bpf_attach(struct cgroup *cgrp, struct bpf_prog *prog, * Must be called with cgroup_mutex held. */ int __cgroup_bpf_detach(struct cgroup *cgrp, struct bpf_prog *prog, - enum bpf_attach_type type, u32 unused_flags) + enum bpf_attach_type type) { struct list_head *progs = &cgrp->bpf.progs[type]; enum bpf_cgroup_storage_type stype; diff --git a/kernel/cgroup/cgroup.c b/kernel/cgroup/cgroup.c index 6d03a27918f4..9802ab424397 100644 --- a/kernel/cgroup/cgroup.c +++ b/kernel/cgroup/cgroup.c @@ -6059,7 +6059,7 @@ int cgroup_bpf_detach(struct cgroup *cgrp, struct bpf_prog *prog, int ret; mutex_lock(&cgroup_mutex); - ret = __cgroup_bpf_detach(cgrp, prog, type, flags); + ret = __cgroup_bpf_detach(cgrp, prog, type); mutex_unlock(&cgroup_mutex); return ret; }