Skip to content

Commit 541c433

Browse files
committed
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
2 parents a8ed228 + 18a777e commit 541c433

3 files changed

Lines changed: 3 additions & 2 deletions

File tree

Documentation/filesystems/ext2.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -388,7 +388,7 @@ Implementations for:
388388

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

fs/isofs/rock.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,7 @@ int get_rock_ridge_filename(struct iso_directory_record *de,
271271
break;
272272
}
273273
len = rr->len - 5;
274-
if (retnamlen + len >= 254) {
274+
if (retnamlen + len > NAME_MAX) {
275275
truncate = 1;
276276
break;
277277
}

fs/quota/quota.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -898,6 +898,7 @@ static struct super_block *quotactl_block(const char __user *special, int cmd)
898898
sb_start_write(sb);
899899
sb_end_write(sb);
900900
put_super(sb);
901+
cond_resched();
901902
goto retry;
902903
}
903904
return sb;

0 commit comments

Comments
 (0)