mirrors/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-03-30 03:35:56 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge tag 'fs_for_v6.20-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs

Browse Source 
Pull quota and isofs updates from Jan Kara:

 - a fix for quotactl livelock during filesystem freezing

 - a small improvement for isofs

 - a documentation fix for ext2

* tag 'fs_for_v6.20-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
  isofs: support full length file names (255 instead of 253)
  quota: fix livelock between quotactl and freeze_super
  doc : fix a broken link in ext2.rst
This commit is contained in:
Linus Torvalds
2026-02-12 10:57:57 -08:00
parent a8ed22870f 18a777eee2
commit 541c43310e
3 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/filesystems/ext2.rst
View File

@@ -388,7 +388,7 @@ Implementations for:
======================= ===========================================================
Windows 95/98/NT/2000 http://www.chrysocome.net/explore2fs
Windows 95 [1]_ http://www.yipton.net/content.html#FSDEXT2
Windows 95 [1]_ http://www.yipton.net/content/fsdext2/
DOS client [1]_ ftp://metalab.unc.edu/pub/Linux/system/filesystems/ext2/
OS/2 [2]_ ftp://metalab.unc.edu/pub/Linux/system/filesystems/ext2/
RISC OS client http://www.esw-heim.tu-clausthal.de/~marco/smorbrod/IscaFS/

2
fs/isofs/rock.c
View File

@@ -271,7 +271,7 @@ int get_rock_ridge_filename(struct iso_directory_record *de,
break;
}
len = rr->len - 5;
if (retnamlen + len >= 254) {
if (retnamlen + len > NAME_MAX) {
truncate = 1;
break;
}

1
fs/quota/quota.c
View File

@@ -898,6 +898,7 @@ static struct super_block *quotactl_block(const char __user *special, int cmd)
sb_start_write(sb);
sb_end_write(sb);
put_super(sb);
cond_resched();
goto retry;
}
return sb;