aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorRoberto Sassu <roberto.sassu@polito.it>2010-11-03 06:11:22 -0400
committerTyler Hicks <tyhicks@linux.vnet.ibm.com>2011-01-17 12:23:01 -0500
commit070baa51286e5cf59dde6be52fa23647ffb5d32d (patch)
treeea0b6bc104a0717f1ae37ddff7620f9cd31a50a6 /fs
parent2a8652f4e0d11ee27b1d2870c600fd1300661a6e (diff)
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')
-rw-r--r--fs/ecryptfs/main.c2
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 @@
36#include <linux/parser.h> 36#include <linux/parser.h>
37#include <linux/fs_stack.h> 37#include <linux/fs_stack.h>
38#include <linux/slab.h> 38#include <linux/slab.h>
39#include <linux/magic.h>
39#include "ecryptfs_kernel.h" 40#include "ecryptfs_kernel.h"
40 41
41/** 42/**
@@ -564,6 +565,7 @@ static struct dentry *ecryptfs_mount(struct file_system_type *fs_type, int flags
564 ecryptfs_set_superblock_lower(s, path.dentry->d_sb); 565 ecryptfs_set_superblock_lower(s, path.dentry->d_sb);
565 s->s_maxbytes = path.dentry->d_sb->s_maxbytes; 566 s->s_maxbytes = path.dentry->d_sb->s_maxbytes;
566 s->s_blocksize = path.dentry->d_sb->s_blocksize; 567 s->s_blocksize = path.dentry->d_sb->s_blocksize;
568 s->s_magic = ECRYPTFS_SUPER_MAGIC;
567 569
568 inode = ecryptfs_get_inode(path.dentry->d_inode, s); 570 inode = ecryptfs_get_inode(path.dentry->d_inode, s);
569 rc = PTR_ERR(inode); 571 rc = PTR_ERR(inode);