Skip to content

Commit ecf8409

Browse files
Christoph Hellwigrichardweinberger
authored andcommitted
ubifs: remove broken lazytime support
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: 8c1c5f2 ("ubifs: introduce UBIFS_ATIME_SUPPORT to ubifs") Signed-off-by: Christoph Hellwig <[email protected]> Signed-off-by: Richard Weinberger <[email protected]>
1 parent c0cc271 commit ecf8409

File tree

1 file changed

+1
-5
lines changed

1 file changed

+1
-5
lines changed

fs/ubifs/file.c

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1375,7 +1375,6 @@ int ubifs_update_time(struct inode *inode, struct timespec64 *time,
13751375
struct ubifs_info *c = inode->i_sb->s_fs_info;
13761376
struct ubifs_budget_req req = { .dirtied_ino = 1,
13771377
.dirtied_ino_d = ALIGN(ui->data_len, 8) };
1378-
int iflags = I_DIRTY_TIME;
13791378
int err, release;
13801379

13811380
if (!IS_ENABLED(CONFIG_UBIFS_ATIME_SUPPORT))
@@ -1393,11 +1392,8 @@ int ubifs_update_time(struct inode *inode, struct timespec64 *time,
13931392
if (flags & S_MTIME)
13941393
inode->i_mtime = *time;
13951394

1396-
if (!(inode->i_sb->s_flags & SB_LAZYTIME))
1397-
iflags |= I_DIRTY_SYNC;
1398-
13991395
release = ui->dirty;
1400-
__mark_inode_dirty(inode, iflags);
1396+
__mark_inode_dirty(inode, I_DIRTY_SYNC);
14011397
mutex_unlock(&ui->ui_mutex);
14021398
if (release)
14031399
ubifs_release_budget(c, &req);

0 commit comments

Comments
 (0)