summaryrefslogtreecommitdiffstats
path: root/fs/ecryptfs/main.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/ecryptfs/main.c')
-rw-r--r--fs/ecryptfs/main.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/ecryptfs/main.c b/fs/ecryptfs/main.c
index f2677c90d96e..025d66a705db 100644
--- a/fs/ecryptfs/main.c
+++ b/fs/ecryptfs/main.c
@@ -560,8 +560,8 @@ static struct dentry *ecryptfs_mount(struct file_system_type *fs_type, int flags
560 * Set the POSIX ACL flag based on whether they're enabled in the lower 560 * Set the POSIX ACL flag based on whether they're enabled in the lower
561 * mount. 561 * mount.
562 */ 562 */
563 s->s_flags = flags & ~MS_POSIXACL; 563 s->s_flags = flags & ~SB_POSIXACL;
564 s->s_flags |= path.dentry->d_sb->s_flags & MS_POSIXACL; 564 s->s_flags |= path.dentry->d_sb->s_flags & SB_POSIXACL;
565 565
566 /** 566 /**
567 * Force a read-only eCryptfs mount when: 567 * Force a read-only eCryptfs mount when:
@@ -569,7 +569,7 @@ static struct dentry *ecryptfs_mount(struct file_system_type *fs_type, int flags
569 * 2) The ecryptfs_encrypted_view mount option is specified 569 * 2) The ecryptfs_encrypted_view mount option is specified
570 */ 570 */
571 if (sb_rdonly(path.dentry->d_sb) || mount_crypt_stat->flags & ECRYPTFS_ENCRYPTED_VIEW_ENABLED) 571 if (sb_rdonly(path.dentry->d_sb) || mount_crypt_stat->flags & ECRYPTFS_ENCRYPTED_VIEW_ENABLED)
572 s->s_flags |= MS_RDONLY; 572 s->s_flags |= SB_RDONLY;
573 573
574 s->s_maxbytes = path.dentry->d_sb->s_maxbytes; 574 s->s_maxbytes = path.dentry->d_sb->s_maxbytes;
575 s->s_blocksize = path.dentry->d_sb->s_blocksize; 575 s->s_blocksize = path.dentry->d_sb->s_blocksize;
@@ -602,7 +602,7 @@ static struct dentry *ecryptfs_mount(struct file_system_type *fs_type, int flags
602 ecryptfs_set_dentry_private(s->s_root, root_info); 602 ecryptfs_set_dentry_private(s->s_root, root_info);
603 root_info->lower_path = path; 603 root_info->lower_path = path;
604 604
605 s->s_flags |= MS_ACTIVE; 605 s->s_flags |= SB_ACTIVE;
606 return dget(s->s_root); 606 return dget(s->s_root);
607 607
608out_free: 608out_free: