ovl: make path-type a bitmap

OVL_PATH_PURE_UPPER -> __OVL_PATH_UPPER | __OVL_PATH_PURE
OVL_PATH_UPPER      -> __OVL_PATH_UPPER
OVL_PATH_MERGE      -> __OVL_PATH_UPPER | __OVL_PATH_MERGE
OVL_PATH_LOWER      -> 0

Multiple R/O layers will allow __OVL_PATH_MERGE without __OVL_PATH_UPPER.

Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>

1 files changed, 5 insertions, 5 deletions

diff --git a/fs/overlayfs/readdir.c b/fs/overlayfs/readdir.c
index 3efa44acf98b..481e44873b65 100644
--- a/fs/overlayfs/readdir.c
+++ b/fs/overlayfs/readdir.c
@@ -253,8 +253,8 @@ static void ovl_dir_reset(struct file *file)
                 ovl_cache_put(od, dentry);
                 od->cache = NULL;
         }
-        WARN_ON(!od->is_real && type != OVL_PATH_MERGE);
-        if (od->is_real && type == OVL_PATH_MERGE)
+        WARN_ON(!od->is_real && !OVL_TYPE_MERGE(type));
+        if (od->is_real && OVL_TYPE_MERGE(type))
                 od->is_real = false;
 }
 
@@ -429,7 +429,7 @@ static int ovl_dir_fsync(struct file *file, loff_t start, loff_t end,
         /*
          * Need to check if we started out being a lower dir, but got copied up
          */
-        if (!od->is_upper && ovl_path_type(dentry) != OVL_PATH_LOWER) {
+        if (!od->is_upper && OVL_TYPE_UPPER(ovl_path_type(dentry))) {
                 struct inode *inode = file_inode(file);
 
                 realfile = lockless_dereference(od->upperfile);
@@ -495,8 +495,8 @@ static int ovl_dir_open(struct inode *inode, struct file *file)
         }
         INIT_LIST_HEAD(&od->cursor.l_node);
         od->realfile = realfile;
-        od->is_real = (type != OVL_PATH_MERGE);
-        od->is_upper = (type != OVL_PATH_LOWER);
+        od->is_real = !OVL_TYPE_MERGE(type);
+        od->is_upper = OVL_TYPE_UPPER(type);
         od->cursor.is_cursor = true;
         file->private_data = od;