From patchwork Fri Jun 5 19:12:46 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabian Frederick X-Patchwork-Id: 6557521 Return-Path: X-Original-To: patchwork-ceph-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id A632EC0020 for ; Fri, 5 Jun 2015 19:13:16 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0A3E120637 for ; Fri, 5 Jun 2015 19:13:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2ECD920634 for ; Fri, 5 Jun 2015 19:13:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751554AbbFETMy (ORCPT ); Fri, 5 Jun 2015 15:12:54 -0400 Received: from mailrelay106.isp.belgacom.be ([195.238.20.133]:33049 "EHLO mailrelay106.isp.belgacom.be" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750820AbbFETMx (ORCPT ); Fri, 5 Jun 2015 15:12:53 -0400 X-Belgacom-Dynamic: yes X-Cloudmark-SP-Filtered: true X-Cloudmark-SP-Result: v=1.1 cv=SBTPB+aU5K4LG/z6P+2X+Qo0AxOejQ4nyx+IVoQ/YQ8= c=1 sm=2 a=TBr_YKAVYX1u2jOng4gA:9 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: A2DhewAp83FV/9oltFtbgXKBHoEyrGMFAYEEmFeBN00BAQEBAQGBC0EDhDsjgRo3iDEB3D+GGYowHYQXBZ5GgS+MBII7h2ckYWYBCzYcgVQ8MYJHAQEB Received: from 218.37-180-91.adsl-dyn.isp.belgacom.be (HELO localhost.home.) ([91.180.37.218]) by relay.skynet.be with ESMTP; 05 Jun 2015 21:12:52 +0200 From: Fabian Frederick To: linux-kernel@vger.kernel.org Cc: Fabian Frederick , "Yan, Zheng" , Sage Weil , ceph-devel@vger.kernel.org Subject: [PATCH 1/1 linux-next] ceph: use standard Opt_err Date: Fri, 5 Jun 2015 21:12:46 +0200 Message-Id: <1433531567-3948-1-git-send-email-fabf@skynet.be> X-Mailer: git-send-email 2.4.2 Sender: ceph-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: ceph-devel@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, 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 ceph used -1 for the last match_table_t option. Use Opt_err enum like other FS match_token() is based on the pattern (NULL) so behavior should remain the same. Signed-off-by: Fabian Frederick --- This is untested. If this one is ok, I can send the same update for rbd and net/ceph. fs/ceph/super.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/fs/ceph/super.c b/fs/ceph/super.c index 4e99053..35ef692 100644 --- a/fs/ceph/super.c +++ b/fs/ceph/super.c @@ -137,7 +137,8 @@ enum { #ifdef CONFIG_CEPH_FS_POSIX_ACL Opt_acl, #endif - Opt_noacl + Opt_noacl, + Opt_err }; static match_table_t fsopt_tokens = { @@ -169,7 +170,7 @@ static match_table_t fsopt_tokens = { {Opt_acl, "acl"}, #endif {Opt_noacl, "noacl"}, - {-1, NULL} + {Opt_err, NULL} }; static int parse_fsopt_token(char *c, void *private)