All of lore.kernel.org
 help / color / mirror / Atom feed
From: Zhihao Cheng <chengzhihao1@huawei.com>
To: <richard@nod.at>, <miquel.raynal@bootlin.com>, <vigneshr@ti.com>,
	<mcoquelin.stm32@gmail.com>, <alexandre.torgue@foss.st.com>,
	<Artem.Bityutskiy@nokia.com>, <ext-adrian.hunter@nokia.com>
Cc: <linux-mtd@lists.infradead.org>, <linux-kernel@vger.kernel.org>,
	<chengzhihao1@huawei.com>
Subject: [PATCH 08/11] ubifs: setflags: Don't make a budget for 'ui->data_len'
Date: Mon, 25 Oct 2021 11:41:13 +0800	[thread overview]
Message-ID: <20211025034116.3544321-9-chengzhihao1@huawei.com> (raw)
In-Reply-To: <20211025034116.3544321-1-chengzhihao1@huawei.com>

'setflags()' affects regular files and directories, only xattr inode,
symlink inode and special inode(pipe/char_dev/block_dev) have none-
zero 'ui->data_len' field.

Remove superfluous space budget for 'dirtied_ino_d', besides add an
assert to verify that 'setflags()' only operates ubifs inode with
zero data_len.

Fixes: 1e51764a3c2ac05a ("UBIFS: add new flash file system")
Signed-off-by: Zhihao Cheng <chengzhihao1@huawei.com>
---
 fs/ubifs/ioctl.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fs/ubifs/ioctl.c b/fs/ubifs/ioctl.c
index c6a863487780..ed95e97a3740 100644
--- a/fs/ubifs/ioctl.c
+++ b/fs/ubifs/ioctl.c
@@ -107,9 +107,9 @@ static int setflags(struct inode *inode, int flags)
 	int err, release;
 	struct ubifs_inode *ui = ubifs_inode(inode);
 	struct ubifs_info *c = inode->i_sb->s_fs_info;
-	struct ubifs_budget_req req = { .dirtied_ino = 1,
-					.dirtied_ino_d = ui->data_len };
+	struct ubifs_budget_req req = { .dirtied_ino = 1 };
 
+	ubifs_assert(c, !ui->data_len);
 	err = ubifs_budget_space(c, &req);
 	if (err)
 		return err;
-- 
2.31.1


WARNING: multiple messages have this Message-ID (diff)
From: Zhihao Cheng <chengzhihao1@huawei.com>
To: <richard@nod.at>, <miquel.raynal@bootlin.com>, <vigneshr@ti.com>,
	<mcoquelin.stm32@gmail.com>, <alexandre.torgue@foss.st.com>,
	<Artem.Bityutskiy@nokia.com>, <ext-adrian.hunter@nokia.com>
Cc: <linux-mtd@lists.infradead.org>, <linux-kernel@vger.kernel.org>,
	<chengzhihao1@huawei.com>
Subject: [PATCH 08/11] ubifs: setflags: Don't make a budget for 'ui->data_len'
Date: Mon, 25 Oct 2021 11:41:13 +0800	[thread overview]
Message-ID: <20211025034116.3544321-9-chengzhihao1@huawei.com> (raw)
In-Reply-To: <20211025034116.3544321-1-chengzhihao1@huawei.com>

'setflags()' affects regular files and directories, only xattr inode,
symlink inode and special inode(pipe/char_dev/block_dev) have none-
zero 'ui->data_len' field.

Remove superfluous space budget for 'dirtied_ino_d', besides add an
assert to verify that 'setflags()' only operates ubifs inode with
zero data_len.

Fixes: 1e51764a3c2ac05a ("UBIFS: add new flash file system")
Signed-off-by: Zhihao Cheng <chengzhihao1@huawei.com>
---
 fs/ubifs/ioctl.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fs/ubifs/ioctl.c b/fs/ubifs/ioctl.c
index c6a863487780..ed95e97a3740 100644
--- a/fs/ubifs/ioctl.c
+++ b/fs/ubifs/ioctl.c
@@ -107,9 +107,9 @@ static int setflags(struct inode *inode, int flags)
 	int err, release;
 	struct ubifs_inode *ui = ubifs_inode(inode);
 	struct ubifs_info *c = inode->i_sb->s_fs_info;
-	struct ubifs_budget_req req = { .dirtied_ino = 1,
-					.dirtied_ino_d = ui->data_len };
+	struct ubifs_budget_req req = { .dirtied_ino = 1 };
 
+	ubifs_assert(c, !ui->data_len);
 	err = ubifs_budget_space(c, &req);
 	if (err)
 		return err;
-- 
2.31.1


______________________________________________________
Linux MTD discussion mailing list
http://lists.infradead.org/mailman/listinfo/linux-mtd/

  parent reply	other threads:[~2021-10-25  3:28 UTC|newest]

Thread overview: 30+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-10-25  3:41 [PATCH 00/11] Some bugfixs for ubifs/ubi Zhihao Cheng
2021-10-25  3:41 ` Zhihao Cheng
2021-10-25  3:41 ` [PATCH 01/11] ubifs: rename_whiteout: Fix double free for whiteout_ui->data Zhihao Cheng
2021-10-25  3:41   ` Zhihao Cheng
2021-10-25  3:41 ` [PATCH 02/11] ubifs: Fix deadlock in concurrent rename whiteout and inode writeback Zhihao Cheng
2021-10-25  3:41   ` Zhihao Cheng
2021-10-25  3:41 ` [PATCH 03/11] ubifs: Fix wrong number of inodes locked by ui_mutex in ubifs_inode comment Zhihao Cheng
2021-10-25  3:41   ` Zhihao Cheng
2021-10-25  3:41 ` [PATCH 04/11] ubifs: Add missing iput if do_tmpfile() failed in rename whiteout Zhihao Cheng
2021-10-25  3:41   ` Zhihao Cheng
2021-10-25  3:41 ` [PATCH 05/11] ubifs: Rename whiteout atomically Zhihao Cheng
2021-10-25  3:41   ` Zhihao Cheng
2021-10-25 14:57   ` kernel test robot
2021-10-25 14:57     ` kernel test robot
2021-10-25 14:57     ` kernel test robot
2021-10-29  5:33   ` kernel test robot
2021-10-29  5:33     ` kernel test robot
2021-10-29  5:33     ` kernel test robot
2021-10-25  3:41 ` [PATCH 06/11] ubifs: Fix 'ui->dirty' race between do_tmpfile() and writeback work Zhihao Cheng
2021-10-25  3:41   ` Zhihao Cheng
2021-10-25  3:41 ` [PATCH 07/11] ubifs: Rectify space amount budget for mkdir/tmpfile operations Zhihao Cheng
2021-10-25  3:41   ` Zhihao Cheng
2021-10-25  3:41 ` Zhihao Cheng [this message]
2021-10-25  3:41   ` [PATCH 08/11] ubifs: setflags: Don't make a budget for 'ui->data_len' Zhihao Cheng
2021-10-25  3:41 ` [PATCH 09/11] ubifs: Fix read out-of-bounds in ubifs_wbuf_write_nolock() Zhihao Cheng
2021-10-25  3:41   ` Zhihao Cheng
2021-10-25  3:41 ` [PATCH 10/11] ubi: fastmap: Return error code if memory allocation fails in add_aeb() Zhihao Cheng
2021-10-25  3:41   ` Zhihao Cheng
2021-10-25  3:41 ` [PATCH 11/11] ubi: fastmap: Add all fastmap pebs into 'ai->fastmap' when fm->used_blocks>=2 Zhihao Cheng
2021-10-25  3:41   ` Zhihao Cheng

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=20211025034116.3544321-9-chengzhihao1@huawei.com \
    --to=chengzhihao1@huawei.com \
    --cc=Artem.Bityutskiy@nokia.com \
    --cc=alexandre.torgue@foss.st.com \
    --cc=ext-adrian.hunter@nokia.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mtd@lists.infradead.org \
    --cc=mcoquelin.stm32@gmail.com \
    --cc=miquel.raynal@bootlin.com \
    --cc=richard@nod.at \
    --cc=vigneshr@ti.com \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.