diff --git a/[refs] b/[refs] index ede689cf32ab..21233c096ddf 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2a8652f4e0d11ee27b1d2870c600fd1300661a6e +refs/heads/master: 070baa51286e5cf59dde6be52fa23647ffb5d32d diff --git a/trunk/fs/ecryptfs/main.c b/trunk/fs/ecryptfs/main.c index d3b28abdd6aa..19f04504f625 100644 --- a/trunk/fs/ecryptfs/main.c +++ b/trunk/fs/ecryptfs/main.c @@ -36,6 +36,7 @@ #include #include #include +#include #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);