fs/9p: Fix bit operation logic error

This re-introduces a fix that somehow got dropped during rebase of the
current series in for-next.  When writeback is enabled, opens
are forced to support both read and write operations but with the
logic error other flags may be dropped unintentionaly.

Reported-by: Christophe Jaillet <christophe.jaillet@wanadoo.fr>
Signed-off-by: Eric Van Hensbergen <ericvh@kernel.org>

diff --git a/fs/9p/vfs_inode.c b/fs/9p/vfs_inode.c
index 54dfe4f10f4383eb9b57a37ca820adf4fe445159..3791f642c50238009a32b44933d796600a681167 100644 (file)
--- a/fs/9p/vfs_inode.c
+++ b/fs/9p/vfs_inode.c
@@ -823,7 +823,7 @@ v9fs_vfs_atomic_open(struct inode *dir, struct dentry *dentry,
        p9_omode = v9fs_uflags2omode(flags, v9fs_proto_dotu(v9ses));
 
        if ((v9ses->cache & CACHE_WRITEBACK) && (p9_omode & P9_OWRITE)) {
-               p9_omode = (p9_omode & !P9_OWRITE) | P9_ORDWR;
+               p9_omode = (p9_omode & ~P9_OWRITE) | P9_ORDWR;
                p9_debug(P9_DEBUG_CACHE,
                        "write-only file with writeback enabled, creating w/ O_RDWR\n");
        }

diff --git a/fs/9p/vfs_inode_dotl.c b/fs/9p/vfs_inode_dotl.c
index f9371b5b70ea6e4c526b51cc610650d81ec58a7a..3acf2bcb69cc04233112d3a2c9504dbf020e6ea8 100644 (file)
--- a/fs/9p/vfs_inode_dotl.c
+++ b/fs/9p/vfs_inode_dotl.c
@@ -288,7 +288,7 @@ v9fs_vfs_atomic_open_dotl(struct inode *dir, struct dentry *dentry,
        }
 
        if ((v9ses->cache & CACHE_WRITEBACK) && (p9_omode & P9_OWRITE)) {
-               p9_omode = (p9_omode & !P9_OWRITE) | P9_ORDWR;
+               p9_omode = (p9_omode & ~P9_OWRITE) | P9_ORDWR;
                p9_debug(P9_DEBUG_CACHE,
                        "write-only file with writeback enabled, creating w/ O_RDWR\n");
        }