Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'fs_for_v5.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs
Pull UDF / reiserfs updates from Jan Kara:
"One UDF fix and one reiserfs cleanup"
* tag 'fs_for_v5.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
udf: Fix error handling in udf_new_inode()
reiserfs: don't use congestion_wait()
+7
-2
+5
-2
fs/reiserfs/journal.c
+5
-2
fs/reiserfs/journal.c
···
951
951
int depth;
952
952
953
953
depth = reiserfs_write_unlock_nested(s);
954
-
congestion_wait(BLK_RW_ASYNC, HZ / 10);
954
+
wait_var_event_timeout(&j->j_async_throttle,
955
+
atomic_read(&j->j_async_throttle) == 0,
956
+
HZ / 10);
955
957
reiserfs_write_lock_nested(s, depth);
956
958
}
957
959
···
1060
1058
put_bh(tbh) ;
1061
1059
}
1062
1060
}
1063
-
atomic_dec(&journal->j_async_throttle);
1061
+
if (atomic_dec_and_test(&journal->j_async_throttle))
1062
+
wake_up_var(&journal->j_async_throttle);
1064
1063
1065
1064
for (i = 0; i < (jl->j_len + 1); i++) {
1066
1065
bn = SB_ONDISK_JOURNAL_1st_BLOCK(s) +
+2
fs/udf/ialloc.c
+2
fs/udf/ialloc.c
···
77
77
GFP_KERNEL);
78
78
}
79
79
if (!iinfo->i_data) {
80
+
make_bad_inode(inode);
80
81
iput(inode);
81
82
return ERR_PTR(-ENOMEM);
82
83
}
···
87
86
dinfo->i_location.partitionReferenceNum,
88
87
start, &err);
89
88
if (err) {
89
+
make_bad_inode(inode);
90
90
iput(inode);
91
91
return ERR_PTR(err);
92
92
}