From: Sascha Hauer <s.hauer@pengutronix.de>
To: linux-fsdevel@vger.kernel.org
Cc: Richard Weinberger <richard@nod.at>,
Sascha Hauer <s.hauer@pengutronix.de>,
linux-mtd@lists.infradead.org, kernel@pengutronix.de,
Jan Kara <jack@suse.com>
Subject: [PATCH 5/8] ubifs: Factor out ubifs_set_feature_flag()
Date: Fri, 24 Jan 2020 14:13:20 +0100 [thread overview]
Message-ID: <20200124131323.23885-6-s.hauer@pengutronix.de> (raw)
In-Reply-To: <20200124131323.23885-1-s.hauer@pengutronix.de>
The code setting a feature flag can be reused for upcoming projid
support. Factor out a function to share the code.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
fs/ubifs/sb.c | 24 +++++++++++++++---------
1 file changed, 15 insertions(+), 9 deletions(-)
diff --git a/fs/ubifs/sb.c b/fs/ubifs/sb.c
index 2b7c04bf8983..628b9adec865 100644
--- a/fs/ubifs/sb.c
+++ b/fs/ubifs/sb.c
@@ -926,28 +926,34 @@ int ubifs_fixup_free_space(struct ubifs_info *c)
return err;
}
-int ubifs_enable_encryption(struct ubifs_info *c)
+static int ubifs_set_feature_flag(struct ubifs_info *c, unsigned int flag)
{
- int err;
struct ubifs_sb_node *sup = c->sup_node;
- if (!IS_ENABLED(CONFIG_FS_ENCRYPTION))
- return -EOPNOTSUPP;
-
- if (c->encrypted)
+ if ((sup->flags & cpu_to_le32(flag)) == cpu_to_le32(flag))
return 0;
if (c->ro_mount || c->ro_media)
return -EROFS;
if (c->fmt_version < 5) {
- ubifs_err(c, "on-flash format version 5 is needed for encryption");
+ ubifs_err(c, "on-flash format version 5 is needed for feature flags");
return -EINVAL;
}
- sup->flags |= cpu_to_le32(UBIFS_FLG_ENCRYPTION);
+ sup->flags |= cpu_to_le32(flag);
+
+ return ubifs_write_sb_node(c, sup);
+}
+
+int ubifs_enable_encryption(struct ubifs_info *c)
+{
+ int err;
+
+ if (!IS_ENABLED(CONFIG_FS_ENCRYPTION))
+ return -EOPNOTSUPP;
- err = ubifs_write_sb_node(c, sup);
+ err = ubifs_set_feature_flag(c, UBIFS_FLG_ENCRYPTION);
if (!err)
c->encrypted = 1;
--
2.25.0
______________________________________________________
Linux MTD discussion mailing list
http://lists.infradead.org/mailman/listinfo/linux-mtd/
next prev parent reply other threads:[~2020-01-24 13:15 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-24 13:13 [PATCH v4 0/8] Add quota support to UBIFS Sascha Hauer
2020-01-24 13:13 ` [PATCH 1/8] quota: Allow to pass mount path to quotactl Sascha Hauer
2020-01-27 10:45 ` Jan Kara
2020-01-28 10:06 ` Sascha Hauer
2020-01-28 11:41 ` Jan Kara
2020-01-29 1:29 ` Al Viro
2020-01-29 16:14 ` Jan Kara
2020-02-04 10:35 ` Sascha Hauer
2020-02-18 9:22 ` Jan Kara
2020-01-24 13:13 ` [PATCH 2/8] ubifs: move checks and preparation into setflags() Sascha Hauer
2020-01-24 13:13 ` [PATCH 3/8] ubifs: Add support for FS_IOC_FS[SG]ETXATTR ioctls Sascha Hauer
2020-01-24 13:13 ` [PATCH 4/8] ubifs: do not ubifs_inode() on potentially NULL pointer Sascha Hauer
2020-01-24 13:13 ` Sascha Hauer [this message]
2020-01-24 13:13 ` [PATCH 6/8] ubifs: Add support for project id Sascha Hauer
2020-01-24 13:13 ` [PATCH 7/8] ubifs: export get_znode Sascha Hauer
2020-01-24 13:13 ` [PATCH 8/8] ubifs: Add quota support Sascha Hauer
2020-01-26 18:30 ` kbuild test robot
2020-01-26 18:30 ` [RFC PATCH] ubifs: tnc_next() can be static kbuild test robot
2021-01-22 15:15 [PATCH v5 0/8] Add quota support to UBIFS Sascha Hauer
2021-01-22 15:15 ` [PATCH 5/8] ubifs: Factor out ubifs_set_feature_flag() Sascha Hauer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200124131323.23885-6-s.hauer@pengutronix.de \
--to=s.hauer@pengutronix.de \
--cc=jack@suse.com \
--cc=kernel@pengutronix.de \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-mtd@lists.infradead.org \
--cc=richard@nod.at \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).