linux-fsdevel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Sascha Hauer <s.hauer@pengutronix.de>
To: linux-fsdevel@vger.kernel.org
Cc: Richard Weinberger <richard@nod.at>,
	linux-mtd@lists.infradead.org, kernel@pengutronix.de,
	Jan Kara <jack@suse.com>, Sascha Hauer <s.hauer@pengutronix.de>
Subject: [PATCH 5/8] ubifs: Factor out ubifs_set_feature_flag()
Date: Fri, 22 Jan 2021 16:15:33 +0100	[thread overview]
Message-ID: <20210122151536.7982-6-s.hauer@pengutronix.de> (raw)
In-Reply-To: <20210122151536.7982-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 c160f718c288..87466836fcfc 100644
--- a/fs/ubifs/sb.c
+++ b/fs/ubifs/sb.c
@@ -924,28 +924,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.20.1


  parent reply	other threads:[~2021-01-22 15:19 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-01-22 15:15 [PATCH v5 0/8] Add quota support to UBIFS Sascha Hauer
2021-01-22 15:15 ` [PATCH 1/8] quota: Allow to pass mount path to quotactl Sascha Hauer
2021-01-22 17:16   ` Christoph Hellwig
2021-01-25  8:38     ` Sascha Hauer
2021-01-25 15:45       ` Jan Kara
2021-01-25 20:42         ` Christoph Hellwig
2021-01-26 13:17           ` Jan Kara
2021-01-26 13:34             ` Christoph Hellwig
2021-01-26 16:18               ` Jan Kara
2021-01-27 14:05                 ` Sascha Hauer
2021-01-27 14:19                   ` Jan Kara
2021-01-26 10:45         ` Sascha Hauer
2021-01-27 14:46           ` Jan Kara
2021-01-27 16:25             ` Christoph Hellwig
2021-01-22 15:15 ` [PATCH 2/8] ubifs: move checks and preparation into setflags() Sascha Hauer
2021-01-22 15:15 ` [PATCH 3/8] ubifs: Add support for FS_IOC_FS[SG]ETXATTR ioctls Sascha Hauer
2021-01-22 17:18   ` Christoph Hellwig
2021-01-22 15:15 ` [PATCH 4/8] ubifs: do not ubifs_inode() on potentially NULL pointer Sascha Hauer
2021-01-22 15:15 ` Sascha Hauer [this message]
2021-01-22 15:15 ` [PATCH 6/8] ubifs: Add support for project id Sascha Hauer
2021-01-22 15:15 ` [PATCH 7/8] ubifs: export get_znode Sascha Hauer
2021-01-22 17:20   ` Christoph Hellwig
2021-01-22 15:15 ` [PATCH 8/8] ubifs: Add quota support Sascha Hauer
  -- strict thread matches above, loose matches on Subject: below --
2020-01-24 13:13 [PATCH v4 0/8] Add quota support to UBIFS Sascha Hauer
2020-01-24 13:13 ` [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=20210122151536.7982-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).