From f30ce2ac9a811c3cf711e409455bcf3bc2c41efd Mon Sep 17 00:00:00 2001 From: Roberto Sassu Date: Wed, 3 Nov 2010 11:11:34 +0100 Subject: [PATCH] --- yaml --- r: 231734 b: refs/heads/master c: 0abe1169470571c473ee720c35fe5b3481c46c46 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/ecryptfs/file.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 459321ecd649..4a4d9fdcd647 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 27992890b02d340198a3a22fc210d13684a41564 +refs/heads/master: 0abe1169470571c473ee720c35fe5b3481c46c46 diff --git a/trunk/fs/ecryptfs/file.c b/trunk/fs/ecryptfs/file.c index 99259f850e58..e069e786da43 100644 --- a/trunk/fs/ecryptfs/file.c +++ b/trunk/fs/ecryptfs/file.c @@ -199,8 +199,8 @@ static int ecryptfs_open(struct inode *inode, struct file *file) ecryptfs_dentry->d_name.name, rc); goto out_free; } - if ((ecryptfs_inode_to_private(inode)->lower_file->f_flags & O_RDONLY) - && !(file->f_flags & O_RDONLY)) { + if ((ecryptfs_inode_to_private(inode)->lower_file->f_flags & O_ACCMODE) + == O_RDONLY && (file->f_flags & O_ACCMODE) != O_RDONLY) { rc = -EPERM; printk(KERN_WARNING "%s: Lower persistent file is RO; eCryptfs " "file must hence be opened RO\n", __func__);