diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2026-02-12 10:57:57 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2026-02-12 10:57:57 -0800 |
| commit | 541c43310e85dbf35368b43b720c6724bc8ad8ec (patch) | |
| tree | 7b1488642b1231c73841119099abef6b3c33c3a1 | |
| parent | a8ed22870f5304a6ac64f694572cafc12801a9cf (diff) | |
| parent | 18a777eee28938a70a7fb103e37ff4ba56e5b673 (diff) | |
Merge tag 'fs_for_v6.20-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs
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
| -rw-r--r-- | Documentation/filesystems/ext2.rst | 2 | ||||
| -rw-r--r-- | fs/isofs/rock.c | 2 | ||||
| -rw-r--r-- | fs/quota/quota.c | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/Documentation/filesystems/ext2.rst b/Documentation/filesystems/ext2.rst index 92aae683e16a..95f48c1fc6fb 100644 --- a/Documentation/filesystems/ext2.rst +++ b/Documentation/filesystems/ext2.rst @@ -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/ diff --git a/fs/isofs/rock.c b/fs/isofs/rock.c index 576498245b9d..6fe6dbd0c740 100644 --- a/fs/isofs/rock.c +++ b/fs/isofs/rock.c @@ -271,7 +271,7 @@ repeat: break; } len = rr->len - 5; - if (retnamlen + len >= 254) { + if (retnamlen + len > NAME_MAX) { truncate = 1; break; } diff --git a/fs/quota/quota.c b/fs/quota/quota.c index ed906725e183..33bacd707580 100644 --- a/fs/quota/quota.c +++ b/fs/quota/quota.c @@ -898,6 +898,7 @@ retry: sb_start_write(sb); sb_end_write(sb); put_super(sb); + cond_resched(); goto retry; } return sb; |