Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e0fdf46a authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Greg Kroah-Hartman
Browse files

ubifs: remove broken lazytime support 



[ Upstream commit ecf84096a526f2632ee85c32a3d05de3fa60ce80 ]

When "ubifs: introduce UBIFS_ATIME_SUPPORT to ubifs" introduced atime
support to ubifs, it also added lazytime support.  As far as I can tell
the lazytime support is terminally broken, as it causes
mark_inode_dirty_sync to be called from __writeback_single_inode, which
will then trigger the locking assert in ubifs_dirty_inode.  Just remove
the broken lazytime support for now, it can be added back later,
especially as some infrastructure changes should make that easier soon.

Fixes: 8c1c5f26 ("ubifs: introduce UBIFS_ATIME_SUPPORT to ubifs")
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent b23af87a

fs/ubifs/file.c

+1 −5
Original line number Original line Diff line number Diff line
@@ -1391,7 +1391,6 @@ int ubifs_update_time(struct inode *inode, struct timespec64 *time, 
	struct ubifs_info *c = inode->i_sb->s_fs_info;

	struct ubifs_info *c = inode->i_sb->s_fs_info;

	struct ubifs_budget_req req = { .dirtied_ino = 1,

	struct ubifs_budget_req req = { .dirtied_ino = 1,

			.dirtied_ino_d = ALIGN(ui->data_len, 8) };

			.dirtied_ino_d = ALIGN(ui->data_len, 8) };

	int iflags = I_DIRTY_TIME;

	int err, release;

	int err, release;





	err = ubifs_budget_space(c, &req);

	err = ubifs_budget_space(c, &req);
@@ -1406,11 +1405,8 @@ int ubifs_update_time(struct inode *inode, struct timespec64 *time, 
	if (flags & S_MTIME)

	if (flags & S_MTIME)

		inode->i_mtime = *time;

		inode->i_mtime = *time;





	if (!(inode->i_sb->s_flags & SB_LAZYTIME))

		iflags |= I_DIRTY_SYNC;



	release = ui->dirty;

	release = ui->dirty;

	__mark_inode_dirty(inode, iflags);

	__mark_inode_dirty(inode, I_DIRTY_SYNC);

	mutex_unlock(&ui->ui_mutex);

	mutex_unlock(&ui->ui_mutex);

	if (release)

	if (release)

		ubifs_release_budget(c, &req);

		ubifs_release_budget(c, &req);