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=-11.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, UNPARSEABLE_RELAY autolearn=ham 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 B771FC4363D for ; Fri, 25 Sep 2020 18:14:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 61F452086A for ; Fri, 25 Sep 2020 18:14:36 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="My59QkS+" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727733AbgIYSOg (ORCPT ); Fri, 25 Sep 2020 14:14:36 -0400 Received: from aserp2130.oracle.com ([141.146.126.79]:57794 "EHLO aserp2130.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727495AbgIYSOf (ORCPT ); Fri, 25 Sep 2020 14:14:35 -0400 Received: from pps.filterd (aserp2130.oracle.com [127.0.0.1]) by aserp2130.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 08PIDbw9138189; Fri, 25 Sep 2020 18:14:33 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=date : from : to : cc : subject : message-id : references : mime-version : content-type : in-reply-to; s=corp-2020-01-29; bh=JLANAMsbEJGbcTOQcWPo10UmKbZLYdBISc1zRZT9Aus=; b=My59QkS+HDnVQLqEyJtCXRhZVk7jd68v6solKrvn6kbZ08G7hzMqKXH2Z2aWR+GUjbdD NVSf6ccP+HQiJCyiBkGYxItXkCp8Dl1QIRFPvOX+KVksqyDQfVDGtHIb+Hlwg98LITax 7Bfe4HDMfP/yhlVVm/S/PcYP6u+0/DSE5y9W4pwN30uk5J8NhXAptv8t38PXQU2qDWGA rznr5bsJ7otzp/0wgIVEaRMJbDVblAl2o1/aXks6ZF0bYJyRMPWI+V0dwzjhU5J4mjqy TH2lzuhxPtGIyW3s7JTwqHp1CXclGxUXjgANrXsmcQhKG7JtFe/LzLE1QdGYbBbfJWr+ 4A== Received: from userp3030.oracle.com (userp3030.oracle.com [156.151.31.80]) by aserp2130.oracle.com with ESMTP id 33qcpuc1dv-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Fri, 25 Sep 2020 18:14:33 +0000 Received: from pps.filterd (userp3030.oracle.com [127.0.0.1]) by userp3030.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 08PIBWZp029738; Fri, 25 Sep 2020 18:14:32 GMT Received: from userv0122.oracle.com (userv0122.oracle.com [156.151.31.75]) by userp3030.oracle.com with ESMTP id 33nux4u2qy-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 25 Sep 2020 18:14:32 +0000 Received: from abhmp0016.oracle.com (abhmp0016.oracle.com [141.146.116.22]) by userv0122.oracle.com (8.14.4/8.14.4) with ESMTP id 08PIEVXY021721; Fri, 25 Sep 2020 18:14:31 GMT Received: from localhost (/10.159.232.106) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Fri, 25 Sep 2020 11:14:31 -0700 Date: Fri, 25 Sep 2020 11:14:30 -0700 From: "Darrick J. Wong" To: Pavel Reichl Cc: linux-xfs@vger.kernel.org Subject: Re: [PATCH v2 2/2] xfs: remove deprecated sysctl options Message-ID: <20200925181430.GM7955@magnolia> References: <20200925165005.48903-1-preichl@redhat.com> <20200925165005.48903-3-preichl@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200925165005.48903-3-preichl@redhat.com> X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9755 signatures=668680 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 malwarescore=0 mlxscore=0 adultscore=0 bulkscore=0 mlxlogscore=999 phishscore=0 suspectscore=1 spamscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2006250000 definitions=main-2009250128 X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9755 signatures=668680 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=1 mlxlogscore=999 adultscore=0 bulkscore=0 mlxscore=0 lowpriorityscore=0 priorityscore=1501 phishscore=0 spamscore=0 malwarescore=0 clxscore=1015 impostorscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2006250000 definitions=main-2009250128 Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org On Fri, Sep 25, 2020 at 06:50:05PM +0200, Pavel Reichl wrote: > These optionr were for Irix compatibility, probably for clustered XFS > clients in a heterogenous cluster which contained both Irix & Linux > machines, so that behavior would be consistent. That doesn't exist anymore > and it's no longer needed. > > Signed-off-by: Pavel Reichl > --- > Documentation/admin-guide/xfs.rst | 3 ++- > fs/xfs/xfs_sysctl.c | 36 +++++++++++++++++++++++++++++-- > 2 files changed, 36 insertions(+), 3 deletions(-) > > diff --git a/Documentation/admin-guide/xfs.rst b/Documentation/admin-guide/xfs.rst > index 717f63a3607a..ce32d9d8529d 100644 > --- a/Documentation/admin-guide/xfs.rst > +++ b/Documentation/admin-guide/xfs.rst > @@ -333,7 +333,8 @@ The following sysctls are available for the XFS filesystem: > Deprecated Sysctls > ================== > > -None at present. > +fs.xfs.irix_sgid_inherit > +fs.xfs.irix_symlink_mode Assuming everyone's fine with removing these in September 2025 as well, I'll tweak this patch to state that date in a table like all the other deprecated/removed stuff. Reviewed-by: Darrick J. Wong --D > > > Removed Sysctls > diff --git a/fs/xfs/xfs_sysctl.c b/fs/xfs/xfs_sysctl.c > index 021ef96d0542..fac9de7ee6d0 100644 > --- a/fs/xfs/xfs_sysctl.c > +++ b/fs/xfs/xfs_sysctl.c > @@ -50,13 +50,45 @@ xfs_panic_mask_proc_handler( > } > #endif /* CONFIG_PROC_FS */ > > +STATIC int > +xfs_deprecate_irix_sgid_inherit_proc_handler( > + struct ctl_table *ctl, > + int write, > + void *buffer, > + size_t *lenp, > + loff_t *ppos) > +{ > + if (write) { > + printk_once(KERN_WARNING > + "XFS: " "%s sysctl option is deprecated.\n", > + ctl->procname); > + } > + return proc_dointvec_minmax(ctl, write, buffer, lenp, ppos); > +} > + > +STATIC int > +xfs_deprecate_irix_symlink_mode_proc_handler( > + struct ctl_table *ctl, > + int write, > + void *buffer, > + size_t *lenp, > + loff_t *ppos) > +{ > + if (write) { > + printk_once(KERN_WARNING > + "XFS: " "%s sysctl option is deprecated.\n", > + ctl->procname); > + } > + return proc_dointvec_minmax(ctl, write, buffer, lenp, ppos); > +} > + > static struct ctl_table xfs_table[] = { > { > .procname = "irix_sgid_inherit", > .data = &xfs_params.sgid_inherit.val, > .maxlen = sizeof(int), > .mode = 0644, > - .proc_handler = proc_dointvec_minmax, > + .proc_handler = xfs_deprecate_irix_sgid_inherit_proc_handler, > .extra1 = &xfs_params.sgid_inherit.min, > .extra2 = &xfs_params.sgid_inherit.max > }, > @@ -65,7 +97,7 @@ static struct ctl_table xfs_table[] = { > .data = &xfs_params.symlink_mode.val, > .maxlen = sizeof(int), > .mode = 0644, > - .proc_handler = proc_dointvec_minmax, > + .proc_handler = xfs_deprecate_irix_symlink_mode_proc_handler, > .extra1 = &xfs_params.symlink_mode.min, > .extra2 = &xfs_params.symlink_mode.max > }, > -- > 2.26.2 >