diff options
| author | Roberto Sassu <roberto.sassu@polito.it> | 2010-11-03 11:11:22 +0100 |
|---|---|---|
| committer | Tyler Hicks <tyhicks@linux.vnet.ibm.com> | 2011-01-17 11:23:01 -0600 |
| commit | 070baa51286e5cf59dde6be52fa23647ffb5d32d (patch) | |
| tree | ea0b6bc104a0717f1ae37ddff7620f9cd31a50a6 /fs/ecryptfs | |
| parent | 2a8652f4e0d11ee27b1d2870c600fd1300661a6e (diff) | |
| download | linux-stable-070baa51286e5cf59dde6be52fa23647ffb5d32d.tar.gz linux-stable-070baa51286e5cf59dde6be52fa23647ffb5d32d.tar.bz2 linux-stable-070baa51286e5cf59dde6be52fa23647ffb5d32d.zip | |
ecryptfs: missing initialization of the superblock 'magic' field
This patch initializes the 'magic' field of ecryptfs filesystems to
ECRYPTFS_SUPER_MAGIC.
Signed-off-by: Roberto Sassu <roberto.sassu@polito.it>
[tyhicks: merge with 66cb76666d69]
Signed-off-by: Tyler Hicks <tyhicks@linux.vnet.ibm.com>
Diffstat (limited to 'fs/ecryptfs')
| -rw-r--r-- | fs/ecryptfs/main.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/ecryptfs/main.c b/fs/ecryptfs/main.c index d3b28abdd6aa..19f04504f625 100644 --- a/fs/ecryptfs/main.c +++ b/fs/ecryptfs/main.c @@ -36,6 +36,7 @@ #include <linux/parser.h> #include <linux/fs_stack.h> #include <linux/slab.h> +#include <linux/magic.h> #include "ecryptfs_kernel.h" /** @@ -564,6 +565,7 @@ static struct dentry *ecryptfs_mount(struct file_system_type *fs_type, int flags ecryptfs_set_superblock_lower(s, path.dentry->d_sb); s->s_maxbytes = path.dentry->d_sb->s_maxbytes; s->s_blocksize = path.dentry->d_sb->s_blocksize; + s->s_magic = ECRYPTFS_SUPER_MAGIC; inode = ecryptfs_get_inode(path.dentry->d_inode, s); rc = PTR_ERR(inode); |