aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAmir Goldstein <amir73il@gmail.com>2017-07-11 08:58:36 -0400
committerMiklos Szeredi <mszeredi@redhat.com>2017-07-13 16:06:46 -0400
commit961af647fc9ebcdb3e98c8f11b399ebe01169fb1 (patch)
tree470a5e693a87b950eece3c82a284da0ea292620c
parentea3dad18dc5f778cfd931311a91a9315aa0065a3 (diff)
ovl: fix origin verification of index dir
Commit 54fb347e836f ("ovl: verify index dir matches upper dir") introduced a new ovl_fh flag OVL_FH_FLAG_PATH_UPPER to indicate an upper file handle, but forgot to add the flag to the mask of valid flags, so index dir origin verification always discards existing origin and stores a new one. Signed-off-by: Amir Goldstein <amir73il@gmail.com> Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
-rw-r--r--fs/overlayfs/overlayfs.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/overlayfs/overlayfs.h b/fs/overlayfs/overlayfs.h
index 60d26605e039..032120a761c4 100644
--- a/fs/overlayfs/overlayfs.h
+++ b/fs/overlayfs/overlayfs.h
@@ -47,7 +47,8 @@ enum ovl_flag {
47/* Is the real inode encoded in fid an upper inode? */ 47/* Is the real inode encoded in fid an upper inode? */
48#define OVL_FH_FLAG_PATH_UPPER (1 << 2) 48#define OVL_FH_FLAG_PATH_UPPER (1 << 2)
49 49
50#define OVL_FH_FLAG_ALL (OVL_FH_FLAG_BIG_ENDIAN | OVL_FH_FLAG_ANY_ENDIAN) 50#define OVL_FH_FLAG_ALL (OVL_FH_FLAG_BIG_ENDIAN | OVL_FH_FLAG_ANY_ENDIAN | \
51 OVL_FH_FLAG_PATH_UPPER)
51 52
52#if defined(__LITTLE_ENDIAN) 53#if defined(__LITTLE_ENDIAN)
53#define OVL_FH_FLAG_CPU_ENDIAN 0 54#define OVL_FH_FLAG_CPU_ENDIAN 0