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=-3.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=no 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 5F44EC3524A for ; Tue, 4 Feb 2020 03:57:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3D9612087E for ; Tue, 4 Feb 2020 03:57:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727124AbgBDD5m (ORCPT ); Mon, 3 Feb 2020 22:57:42 -0500 Received: from outbound.smtp.vt.edu ([198.82.183.121]:55122 "EHLO omr1.cc.vt.edu" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726984AbgBDD5m (ORCPT ); Mon, 3 Feb 2020 22:57:42 -0500 X-Greylist: delayed 1983 seconds by postgrey-1.27 at vger.kernel.org; Mon, 03 Feb 2020 22:57:40 EST 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 0143OaQa012815 for ; Mon, 3 Feb 2020 22:24:36 -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 0143OVq5003796 for ; Mon, 3 Feb 2020 22:24:36 -0500 Received: by mail-qk1-f197.google.com with SMTP id w29so10997943qkw.1 for ; Mon, 03 Feb 2020 19:24:36 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:mime-version:date :message-id; bh=V0/IZKokpuyk/X3Vu3SualtRqH1dQKvBg/2kFPFAJ0I=; b=rQFAEneNxO6JXedh2NoL9VD3jOu7cFn3MNAAUcqufZ4rfvvTrPlV+0uvbQklGir9m6 Q6uUzkkwsSfQhUYSXEwKC2DKh81XSZXFWDmk1xzguv7atj/o/F5XaJc+d6ZdkVegAfPh 8ciDC0TcQ0/gqJZ6d4UaU68uWRpLCcyMo+MN6uJqIoSBgCp5zf45bpIMQjAPfwLK2ouQ tPHKbxkDRE43bix+CtoblIoSfCxARES/tCH+5Zyl2YCz8k13hE2/C/wmJNOf7DnVgTdD jiJ5mHdnCD7lpamUM4hphqpdjC25gd/OYAHhiyCTYYEpS+YlUHgd2nTymFABMkiEqQ69 R50w== X-Gm-Message-State: APjAAAWIuIAV4Z8JxTkYAv262sR83C7zt0+cyIsg83A+88/acUlkBBpU B+VQVC0q0jBJ+1K/3ryWK+fwz/JIU/nTwYMzDKSHhXoUrhKrFmH8CJHRTYQkCnPgmbDyVAJvUs5 XZBuLiZUW7PsT2qpoxMqRbdy4+Gq0wzbmWQ4= X-Received: by 2002:a05:620a:911:: with SMTP id v17mr27054844qkv.94.1580786671453; Mon, 03 Feb 2020 19:24:31 -0800 (PST) X-Google-Smtp-Source: APXvYqynlzp4F+A8uKELbLyu6AWOZzAz2UaDwcopLrdiLMlBxHlUbdeuosTBDbmuyLkGEK4SfzEj1Q== X-Received: by 2002:a05:620a:911:: with SMTP id v17mr27054821qkv.94.1580786671163; Mon, 03 Feb 2020 19:24:31 -0800 (PST) Received: from turing-police ([2601:5c0:c001:c9e1::359]) by smtp.gmail.com with ESMTPSA id b144sm3302012qkg.126.2020.02.03.19.24.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Feb 2020 19:24:29 -0800 (PST) From: "Valdis =?utf-8?Q?Kl=c4=93tnieks?=" X-Google-Original-From: "Valdis =?utf-8?Q?Kl=c4=93tnieks?=" X-Mailer: exmh version 2.9.0 11/07/2018 with nmh-1.7+dev To: Namjae Jeon cc: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, gregkh@linuxfoundation.org, hch@lst.de, sj1557.seo@samsung.com, pali.rohar@gmail.com, arnd@arndb.de, namjae.jeon@samsung.com, viro@zeniv.linux.org.uk Subject: [PATCH] exfat: update file system parameter handling Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Mon, 03 Feb 2020 22:24:28 -0500 Message-ID: <297144.1580786668@turing-police> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Al Viro recently reworked the way file system parameters are handled Update super.c to work with it in linux-next 20200203. Signed-off-by: Valdis Kletnieks --- fs/exfat/super.c.orig 2020-02-03 21:11:02.562305585 -0500 +++ fs/exfat/super.c 2020-02-03 22:17:21.699045311 -0500 @@ -214,7 +214,14 @@ enum { Opt_time_offset, }; -static const struct fs_parameter_spec exfat_param_specs[] = { +static const struct constant_table exfat_param_enums[] = { + { "continue", EXFAT_ERRORS_CONT }, + { "panic", EXFAT_ERRORS_PANIC }, + { "remount-ro", EXFAT_ERRORS_RO }, + {} +}; + +static const struct fs_parameter_spec exfat_parameters[] = { fsparam_u32("uid", Opt_uid), fsparam_u32("gid", Opt_gid), fsparam_u32oct("umask", Opt_umask), @@ -222,25 +229,12 @@ static const struct fs_parameter_spec ex fsparam_u32oct("fmask", Opt_fmask), fsparam_u32oct("allow_utime", Opt_allow_utime), fsparam_string("iocharset", Opt_charset), - fsparam_enum("errors", Opt_errors), + fsparam_enum("errors", Opt_errors, exfat_param_enums), fsparam_flag("discard", Opt_discard), fsparam_s32("time_offset", Opt_time_offset), {} }; -static const struct fs_parameter_enum exfat_param_enums[] = { - { Opt_errors, "continue", EXFAT_ERRORS_CONT }, - { Opt_errors, "panic", EXFAT_ERRORS_PANIC }, - { Opt_errors, "remount-ro", EXFAT_ERRORS_RO }, - {} -}; - -static const struct fs_parameter_description exfat_parameters = { - .name = "exfat", - .specs = exfat_param_specs, - .enums = exfat_param_enums, -}; - static int exfat_parse_param(struct fs_context *fc, struct fs_parameter *param) { struct exfat_sb_info *sbi = fc->s_fs_info; @@ -248,7 +242,7 @@ static int exfat_parse_param(struct fs_c struct fs_parse_result result; int opt; - opt = fs_parse(fc, &exfat_parameters, param, &result); + opt = fs_parse(fc, exfat_parameters, param, &result); if (opt < 0) return opt; @@ -665,7 +659,7 @@ static struct file_system_type exfat_fs_ .owner = THIS_MODULE, .name = "exfat", .init_fs_context = exfat_init_fs_context, - .parameters = &exfat_parameters, + .parameters = exfat_parameters, .kill_sb = kill_block_super, .fs_flags = FS_REQUIRES_DEV, };