Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit 070baa51286e5cf59dde6be52fa23647ffb5d32d

Authored by Roberto Sassu
Committed by Tyler Hicks
1 parent 2a8652f4e0
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

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>

Showing 1 changed file with 2 additions and 0 deletions Side-by-side Diff

... ... @@ -36,6 +36,7 @@
36 36 #include <linux/parser.h>
37 37 #include <linux/fs_stack.h>
38 38 #include <linux/slab.h>
  39 +#include <linux/magic.h>
39 40 #include "ecryptfs_kernel.h"
40 41  
41 42 /**
... ... @@ -564,6 +565,7 @@
564 565 ecryptfs_set_superblock_lower(s, path.dentry->d_sb);
565 566 s->s_maxbytes = path.dentry->d_sb->s_maxbytes;
566 567 s->s_blocksize = path.dentry->d_sb->s_blocksize;
  568 + s->s_magic = ECRYPTFS_SUPER_MAGIC;
567 569  
568 570 inode = ecryptfs_get_inode(path.dentry->d_inode, s);
569 571 rc = PTR_ERR(inode);