Merge tag 'fs_for_v6.20-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs
Merge commit. Changes below are compared with the first parent: a8ed2287.
Changes
3 files changed · +3 −2
| File | Status | Add | Del | Content |
|---|---|---|---|---|
| Documentation/filesystems/ext2.rst | modified | +1 | −1 | View file |
| fs/isofs/rock.c | modified | +1 | −1 | View file |
| fs/quota/quota.c | modified | +1 | −0 | View file |
Documentation/filesystems/ext2.rst
View filediff --git a/Documentation/filesystems/ext2.rst b/Documentation/filesystems/ext2.rst
index 92aae68..95f48c1 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/
fs/isofs/rock.c
View filediff --git a/fs/isofs/rock.c b/fs/isofs/rock.c
index 5764982..6fe6dbd 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;
}
fs/quota/quota.c
View filediff --git a/fs/quota/quota.c b/fs/quota/quota.c
index ed90672..33bacd7 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;