Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'jfs-7.0' of github.com:kleikamp/linux-shaggy
Pull jfs updates from Dave Kleikamp:
"Just a handful of minor jfs fixes"
* tag 'jfs-7.0' of github.com:kleikamp/linux-shaggy:
jfs: avoid -Wtautological-constant-out-of-range-compare warning
jfs: Add missing set_freezable() for freezable kthread
jfs: nlink overflow in jfs_rename
+7
-4
+2
-2
fs/jfs/jfs_dtree.c
+2
-2
fs/jfs/jfs_dtree.c
···
2903
2903
stbl = DT_GETSTBL(p);
2904
2904
2905
2905
for (i = index; i < p->header.nextindex; i++) {
2906
-
if (stbl[i] < 0 || stbl[i] >= DTPAGEMAXSLOT) {
2906
+
if (stbl[i] < 0) {
2907
2907
jfs_err("JFS: Invalid stbl[%d] = %d for inode %ld, block = %lld",
2908
2908
i, stbl[i], (long)ip->i_ino, (long long)bn);
2909
2909
free_page(dirent_buf);
···
3108
3108
/* get the leftmost entry */
3109
3109
stbl = DT_GETSTBL(p);
3110
3110
3111
-
if (stbl[0] < 0 || stbl[0] >= DTPAGEMAXSLOT) {
3111
+
if (stbl[0] < 0) {
3112
3112
DT_PUTPAGE(mp);
3113
3113
jfs_error(ip->i_sb, "stbl[0] out of bound\n");
3114
3114
return -EIO;
+1
fs/jfs/jfs_logmgr.c
+1
fs/jfs/jfs_logmgr.c
+4
-2
fs/jfs/namei.c
+4
-2
fs/jfs/namei.c
···
1229
1229
jfs_err("jfs_rename: dtInsert returned -EIO");
1230
1230
goto out_tx;
1231
1231
}
1232
-
if (S_ISDIR(old_ip->i_mode))
1232
+
if (S_ISDIR(old_ip->i_mode) && old_dir != new_dir)
1233
1233
inc_nlink(new_dir);
1234
1234
}
1235
1235
/*
···
1245
1245
goto out_tx;
1246
1246
}
1247
1247
if (S_ISDIR(old_ip->i_mode)) {
1248
-
drop_nlink(old_dir);
1248
+
if (new_ip || old_dir != new_dir)
1249
+
drop_nlink(old_dir);
1250
+
1249
1251
if (old_dir != new_dir) {
1250
1252
/*
1251
1253
* Change inode number of parent for moved directory