d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Split the dir_index and dir_nlink features.

Browse Source 
Do not allow to create more that EXT4_LINK_MAX links to directory in case
if the dir_nlink is not set, like it is done in the fresh e2fsprogs updates.

MFC after:      3 months
This commit is contained in:
fsu 2018-08-08 12:08:46 +00:00
parent 81cc2049c1
commit 81f6e0be11
2 changed files with 13 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sys/fs/ext2fs/ext2_dir.h
View File

@ -89,7 +89,6 @@ struct ext2fs_direct_tail {
/*
* Maximal count of links to a file
*/
#define EXT2_LINK_MAX 32000
#define EXT4_LINK_MAX 65000
/*

35
sys/fs/ext2fs/ext2_vnops.c
View File

@ -675,19 +675,6 @@ out:
return (error);
}
static unsigned short
ext2_max_nlink(struct inode *ip)
{
struct m_ext2fs *fs;
fs = ip->i_e2fs;
if (EXT2_HAS_RO_COMPAT_FEATURE(fs, EXT2F_ROCOMPAT_DIR_NLINK))
return (EXT4_LINK_MAX);
else
return (EXT2_LINK_MAX);
}
/*
* link vnode call
*/
@ -705,7 +692,7 @@ ext2_link(struct vop_link_args *ap)
panic("ext2_link: no name");
#endif
ip = VTOI(vp);
if ((nlink_t)ip->i_nlink >= ext2_max_nlink(ip)) {
if ((nlink_t)ip->i_nlink >= EXT4_LINK_MAX) {
error = EMLINK;
goto out;
}
@ -732,10 +719,12 @@ ext2_inc_nlink(struct inode *ip)
ip->i_nlink++;
if (ext2_htree_has_idx(ip) && ip->i_nlink > 1) {
if (ip->i_nlink >= ext2_max_nlink(ip) || ip->i_nlink == 2)
if (S_ISDIR(ip->i_mode) &&
EXT2_HAS_RO_COMPAT_FEATURE(ip->i_e2fs, EXT2F_ROCOMPAT_DIR_NLINK) &&
ip->i_nlink > 1) {
if (ip->i_nlink >= EXT4_LINK_MAX || ip->i_nlink == 2)
ip->i_nlink = 1;
} else if (ip->i_nlink > ext2_max_nlink(ip)) {
} else if (ip->i_nlink > EXT4_LINK_MAX) {
ip->i_nlink--;
return (EMLINK);
}
@ -833,7 +822,8 @@ abortit:
goto abortit;
dp = VTOI(fdvp);
ip = VTOI(fvp);
if (ip->i_nlink >= ext2_max_nlink(ip) && !ext2_htree_has_idx(ip)) {
if (ip->i_nlink >= EXT4_LINK_MAX &&
!EXT2_HAS_RO_COMPAT_FEATURE(ip->i_e2fs, EXT2F_ROCOMPAT_DIR_NLINK)) {
VOP_UNLOCK(fvp, 0);
error = EMLINK;
goto abortit;
@ -1304,8 +1294,8 @@ ext2_mkdir(struct vop_mkdir_args *ap)
panic("ext2_mkdir: no name");
#endif
dp = VTOI(dvp);
if ((nlink_t)dp->i_nlink >= ext2_max_nlink(dp) &&
!ext2_htree_has_idx(dp)) {
if ((nlink_t)dp->i_nlink >= EXT4_LINK_MAX &&
!EXT2_HAS_RO_COMPAT_FEATURE(dp->i_e2fs, EXT2F_ROCOMPAT_DIR_NLINK)) {
error = EMLINK;
goto out;
}
@ -1655,10 +1645,11 @@ ext2_pathconf(struct vop_pathconf_args *ap)
switch (ap->a_name) {
case _PC_LINK_MAX:
if (ext2_htree_has_idx(VTOI(ap->a_vp)))
if (EXT2_HAS_RO_COMPAT_FEATURE(VTOI(ap->a_vp)->i_e2fs,
EXT2F_ROCOMPAT_DIR_NLINK))
*ap->a_retval = INT_MAX;
else
*ap->a_retval = ext2_max_nlink(VTOI(ap->a_vp));
*ap->a_retval = EXT4_LINK_MAX;
break;
case _PC_NAME_MAX:
*ap->a_retval = NAME_MAX;