diff options
| author | Leann Ogasawara <leann.ogasawara@canonical.com> | 2011-08-15 13:03:55 -0700 |
|---|---|---|
| committer | John Rigby <john.rigby@linaro.org> | 2011-11-16 14:25:26 -0700 |
| commit | ad6d43a67b8ad9d4c9f72c2d76bf5adf2095e92c (patch) | |
| tree | 43f533f0501e3db8021db78990f0915bb589daf5 | |
| parent | b62cd44da664376809e514c38050157be3a430eb (diff) | |
Revert "UBUNTU: ubuntu: overlayfs -- fs: limit filesystem stacking depth"
This reverts commit d72ccf8cb287df877221c874efb38f343f671e86.
| -rw-r--r-- | fs/ecryptfs/main.c | 7 | ||||
| -rw-r--r-- | fs/overlayfs/super.c | 10 | ||||
| -rw-r--r-- | include/linux/fs.h | 11 |
3 files changed, 0 insertions, 28 deletions
diff --git a/fs/ecryptfs/main.c b/fs/ecryptfs/main.c index 703cda3bb66..b4a6befb121 100644 --- a/fs/ecryptfs/main.c +++ b/fs/ecryptfs/main.c @@ -544,13 +544,6 @@ static struct dentry *ecryptfs_mount(struct file_system_type *fs_type, int flags s->s_maxbytes = path.dentry->d_sb->s_maxbytes; s->s_blocksize = path.dentry->d_sb->s_blocksize; s->s_magic = ECRYPTFS_SUPER_MAGIC; - s->s_stack_depth = path.dentry->d_sb->s_stack_depth + 1; - - rc = -EINVAL; - if (s->s_stack_depth > FILESYSTEM_MAX_STACK_DEPTH) { - printk(KERN_ERR "eCryptfs: maximum fs stacking depth exceeded\n"); - goto out_free; - } inode = ecryptfs_get_inode(path.dentry->d_inode, s); rc = PTR_ERR(inode); diff --git a/fs/overlayfs/super.c b/fs/overlayfs/super.c index a64f0f4820e..427bb555020 100644 --- a/fs/overlayfs/super.c +++ b/fs/overlayfs/super.c @@ -545,16 +545,6 @@ static int ovl_fill_super(struct super_block *sb, void *data, int silent) !S_ISDIR(lowerpath.dentry->d_inode->i_mode)) goto out_put_lowerpath; - sb->s_stack_depth = max(upperpath.mnt->mnt_sb->s_stack_depth, - lowerpath.mnt->mnt_sb->s_stack_depth) + 1; - - err = -EINVAL; - if (sb->s_stack_depth > FILESYSTEM_MAX_STACK_DEPTH) { - printk(KERN_ERR "overlayfs: maximum fs stacking depth exceeded\n"); - goto out_put_lowerpath; - } - - ufs->upper_mnt = clone_private_mount(&upperpath); err = PTR_ERR(ufs->upper_mnt); if (IS_ERR(ufs->upper_mnt)) { diff --git a/include/linux/fs.h b/include/linux/fs.h index b538453a251..bd859aec437 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -481,12 +481,6 @@ struct iattr { */ #include <linux/quota.h> -/* - * Maximum number of layers of fs stack. Needs to be limited to - * prevent kernel stack overflow - */ -#define FILESYSTEM_MAX_STACK_DEPTH 2 - /** * enum positive_aop_returns - aop return codes with specific semantics * @@ -1467,11 +1461,6 @@ struct super_block { int cleancache_poolid; struct shrinker s_shrink; /* per-sb shrinker handle */ - - /* - * Indicates how deep in a filesystem stack this SB is - */ - int s_stack_depth; }; /* superblock cache pruning functions */ |