diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2012-02-06 12:45:27 -0500 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2012-03-20 21:29:32 -0400 |
commit | 8de52778798fe39660a8d6b26f290e0c93202761 (patch) | |
tree | 56384beb7863c1f338f2b66b509bf58eea5a99c2 /fs/logfs | |
parent | c16fa4f2ad19908a47c63d8fa436a1178438c7e7 (diff) |
vfs: check i_nlink limits in vfs_{mkdir,rename_dir,link}
New field of struct super_block - ->s_max_links. Maximal allowed
value of ->i_nlink or 0; in the latter case all checks still need
to be done in ->link/->mkdir/->rename instances. Note that this
limit applies both to directoris and to non-directories.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/logfs')
-rw-r--r-- | fs/logfs/dir.c | 3 | ||||
-rw-r--r-- | fs/logfs/super.c | 1 |
2 files changed, 1 insertions, 3 deletions
diff --git a/fs/logfs/dir.c b/fs/logfs/dir.c index 3de7a32cadbe..4aea231fc9e6 100644 --- a/fs/logfs/dir.c +++ b/fs/logfs/dir.c | |||
@@ -558,9 +558,6 @@ static int logfs_link(struct dentry *old_dentry, struct inode *dir, | |||
558 | { | 558 | { |
559 | struct inode *inode = old_dentry->d_inode; | 559 | struct inode *inode = old_dentry->d_inode; |
560 | 560 | ||
561 | if (inode->i_nlink >= LOGFS_LINK_MAX) | ||
562 | return -EMLINK; | ||
563 | |||
564 | inode->i_ctime = dir->i_ctime = dir->i_mtime = CURRENT_TIME; | 561 | inode->i_ctime = dir->i_ctime = dir->i_mtime = CURRENT_TIME; |
565 | ihold(inode); | 562 | ihold(inode); |
566 | inc_nlink(inode); | 563 | inc_nlink(inode); |
diff --git a/fs/logfs/super.c b/fs/logfs/super.c index c9ee7f5d1caf..b1a491a5fe78 100644 --- a/fs/logfs/super.c +++ b/fs/logfs/super.c | |||
@@ -542,6 +542,7 @@ static struct dentry *logfs_get_sb_device(struct logfs_super *super, | |||
542 | * the filesystem incompatible with 32bit systems. | 542 | * the filesystem incompatible with 32bit systems. |
543 | */ | 543 | */ |
544 | sb->s_maxbytes = (1ull << 43) - 1; | 544 | sb->s_maxbytes = (1ull << 43) - 1; |
545 | sb->s_max_links = LOGFS_LINK_MAX; | ||
545 | sb->s_op = &logfs_super_operations; | 546 | sb->s_op = &logfs_super_operations; |
546 | sb->s_flags = flags | MS_NOATIME; | 547 | sb->s_flags = flags | MS_NOATIME; |
547 | 548 | ||