summaryrefslogtreecommitdiff
path: root/fs/overlayfs/ovl_entry.h
diff options
context:
space:
mode:
authorMiklos Szeredi <mszeredi@redhat.com>2017-07-04 22:03:16 +0200
committerMiklos Szeredi <mszeredi@redhat.com>2017-07-04 22:03:16 +0200
commit09d8b586731bf589655c2ac971532c14cf272b63 (patch)
tree5acbbdb16f462e772083c847e54f82ef68c9727f /fs/overlayfs/ovl_entry.h
parent9020df37207867272e590a416c2fb3da0e5383c6 (diff)
ovl: move __upperdentry to ovl_inode
Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
Diffstat (limited to 'fs/overlayfs/ovl_entry.h')
-rw-r--r--fs/overlayfs/ovl_entry.h13
1 files changed, 6 insertions, 7 deletions
diff --git a/fs/overlayfs/ovl_entry.h b/fs/overlayfs/ovl_entry.h
index b8c213891e84..ddd937490f0d 100644
--- a/fs/overlayfs/ovl_entry.h
+++ b/fs/overlayfs/ovl_entry.h
@@ -36,7 +36,6 @@ struct ovl_fs {
/* private information held for every overlayfs dentry */
struct ovl_entry {
- struct dentry *__upperdentry;
struct ovl_dir_cache *cache;
union {
struct {
@@ -54,14 +53,9 @@ struct ovl_entry {
struct ovl_entry *ovl_alloc_entry(unsigned int numlower);
-static inline struct dentry *ovl_upperdentry_dereference(struct ovl_entry *oe)
-{
- return lockless_dereference(oe->__upperdentry);
-}
-
struct ovl_inode {
struct inode vfs_inode;
- struct inode *upper;
+ struct dentry *__upperdentry;
struct inode *lower;
};
@@ -69,3 +63,8 @@ static inline struct ovl_inode *OVL_I(struct inode *inode)
{
return container_of(inode, struct ovl_inode, vfs_inode);
}
+
+static inline struct dentry *ovl_upperdentry_dereference(struct ovl_inode *oi)
+{
+ return lockless_dereference(oi->__upperdentry);
+}