From: Amir Goldstein <amir73il@gmail.com>
To: Miklos Szeredi <miklos@szeredi.hu>
Cc: Al Viro <viro@zeniv.linux.org.uk>,
linux-unionfs@vger.kernel.org, linux-fsdevel@vger.kernel.org
Subject: [RFC][PATCH 08/13] ovl: allow hashing non upper inodes
Date: Mon, 17 Apr 2017 02:59:38 +0300 [thread overview]
Message-ID: <1492387183-18847-9-git-send-email-amir73il@gmail.com> (raw)
In-Reply-To: <1492387183-18847-1-git-send-email-amir73il@gmail.com>
As preparation for hashing all overlay inodes, pass is_upper to
ovl_get_inode() and the iget5_locked() callbacks, instead of assuming
that the hashed inode is upper.
Signed-off-by: Amir Goldstein <amir73il@gmail.com>
---
fs/overlayfs/inode.c | 11 ++++++-----
fs/overlayfs/namei.c | 2 +-
fs/overlayfs/overlayfs.h | 7 +++++--
3 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/fs/overlayfs/inode.c b/fs/overlayfs/inode.c
index a6d7c44..9a429ed 100644
--- a/fs/overlayfs/inode.c
+++ b/fs/overlayfs/inode.c
@@ -416,22 +416,23 @@ void ovl_inode_update(struct inode *inode, struct inode *upperinode)
static int ovl_inode_test(struct inode *inode, void *data)
{
- return ovl_inode_real(inode, NULL) == data;
+ return ovl_inode_real(inode, NULL) == OVL_INODE_REAL(data);
}
static int ovl_inode_set(struct inode *inode, void *data)
{
- ovl_set_inode_data(inode, data, true);
+ WRITE_ONCE(inode->i_private, data);
return 0;
}
-struct inode *ovl_get_inode(struct super_block *sb, struct inode *realinode)
-
+struct inode *ovl_get_inode(struct super_block *sb, struct inode *realinode,
+ bool is_upper)
{
struct inode *inode;
inode = iget5_locked(sb, (unsigned long) realinode,
- ovl_inode_test, ovl_inode_set, realinode);
+ ovl_inode_test, ovl_inode_set,
+ ovl_inode_data(realinode, is_upper));
if (inode && inode->i_state & I_NEW) {
ovl_fill_inode(inode, realinode->i_mode, realinode->i_rdev);
set_nlink(inode, realinode->i_nlink);
diff --git a/fs/overlayfs/namei.c b/fs/overlayfs/namei.c
index 42b6030..9569ded 100644
--- a/fs/overlayfs/namei.c
+++ b/fs/overlayfs/namei.c
@@ -470,7 +470,7 @@ struct dentry *ovl_lookup(struct inode *dir, struct dentry *dentry,
err = -ENOMEM;
if (upperdentry && !d_is_dir(upperdentry)) {
- inode = ovl_get_inode(dentry->d_sb, realinode);
+ inode = ovl_get_inode(dentry->d_sb, realinode, true);
} else {
inode = ovl_new_inode(dentry->d_sb, realinode->i_mode,
realinode->i_rdev);
diff --git a/fs/overlayfs/overlayfs.h b/fs/overlayfs/overlayfs.h
index f9d2d77..dacee9e 100644
--- a/fs/overlayfs/overlayfs.h
+++ b/fs/overlayfs/overlayfs.h
@@ -23,6 +23,8 @@ enum ovl_path_type {
#define OVL_XATTR_FH OVL_XATTR_PREFIX "fh"
#define OVL_ISUPPER_MASK 1UL
+#define OVL_INODE_REAL(x) ((struct inode *) \
+ ((unsigned long)x & ~OVL_ISUPPER_MASK))
static inline int ovl_do_rmdir(struct inode *dir, struct dentry *dentry)
{
@@ -144,7 +146,7 @@ static inline struct inode *ovl_inode_real(struct inode *inode, bool *is_upper)
if (is_upper)
*is_upper = x & OVL_ISUPPER_MASK;
- return (struct inode *) (x & ~OVL_ISUPPER_MASK);
+ return OVL_INODE_REAL(x);
}
/* redirect data format for redirect by file handle */
@@ -226,7 +228,8 @@ struct inode *ovl_new_inode(struct super_block *sb, umode_t mode, dev_t rdev);
void ovl_inode_init(struct inode *inode, struct inode *realinode,
bool is_upper);
void ovl_inode_update(struct inode *inode, struct inode *upperinode);
-struct inode *ovl_get_inode(struct super_block *sb, struct inode *realinode);
+struct inode *ovl_get_inode(struct super_block *sb, struct inode *realinode,
+ bool is_upper);
static inline void ovl_copyattr(struct inode *from, struct inode *to)
{
--
2.7.4
next prev parent reply other threads:[~2017-04-16 23:59 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-16 23:59 [RFC][PATCH 00/13] overlayfs stable inodes Amir Goldstein
2017-04-16 23:59 ` [RFC][PATCH 01/13] ovl: check if all layers are on the same fs Amir Goldstein
2017-04-16 23:59 ` [RFC][PATCH 02/13] ovl: redirect dir by file handle on copy up Amir Goldstein
2017-04-17 13:33 ` Rock Lee
2017-04-17 14:03 ` Amir Goldstein
2017-04-17 19:49 ` Vivek Goyal
2017-04-17 21:14 ` Amir Goldstein
2017-04-19 15:16 ` Miklos Szeredi
2017-04-19 15:27 ` Amir Goldstein
2017-04-19 15:33 ` Miklos Szeredi
2017-04-19 15:43 ` Amir Goldstein
2017-04-20 8:55 ` Amir Goldstein
2017-04-21 15:02 ` Miklos Szeredi
2017-04-21 15:29 ` Amir Goldstein
2017-04-16 23:59 ` [RFC][PATCH 03/13] ovl: lookup redirect by file handle Amir Goldstein
2017-04-18 13:05 ` Vivek Goyal
2017-04-18 14:05 ` Amir Goldstein
2017-04-18 18:32 ` Vivek Goyal
2017-04-18 18:57 ` Amir Goldstein
2017-04-19 15:21 ` Miklos Szeredi
2017-04-19 15:35 ` Amir Goldstein
2017-04-16 23:59 ` [RFC][PATCH 04/13] ovl: store file handle of stable inode Amir Goldstein
2017-04-16 23:59 ` [RFC][PATCH 05/13] ovl: lookup stable inode by file handle Amir Goldstein
2017-04-16 23:59 ` [RFC][PATCH 06/13] ovl: move inode helpers to inode.c Amir Goldstein
2017-04-16 23:59 ` [RFC][PATCH 07/13] ovl: create helpers for initializing hashed inode Amir Goldstein
2017-04-16 23:59 ` Amir Goldstein [this message]
2017-04-16 23:59 ` [RFC][PATCH 09/13] ovl: inherit overlay inode ino/generation from real inode Amir Goldstein
2017-04-16 23:59 ` [RFC][PATCH 10/13] ovl: hash overlay inodes by stable inode Amir Goldstein
2017-04-16 23:59 ` [RFC][PATCH 11/13] ovl: fix du --one-file-system on overlay mount Amir Goldstein
2017-04-16 23:59 ` [RFC][PATCH 12/13] ovl: constant ino across copy up Amir Goldstein
2017-04-16 23:59 ` [RFC][PATCH 13/13] ovl: try to hardlink upper on copy up of lower hardlinks Amir Goldstein
2017-04-18 18:37 ` [RFC][PATCH 00/13] overlayfs stable inodes Amir Goldstein
2017-04-19 9:16 ` Miklos Szeredi
2017-04-19 10:37 ` Amir Goldstein
2017-04-19 13:52 ` Miklos Szeredi
2017-04-19 14:46 ` Amir Goldstein
2017-04-19 15:01 ` Miklos Szeredi
2017-04-19 15:17 ` Amir Goldstein
2017-04-19 22:58 ` Darrick J. Wong
2017-04-19 23:15 ` Andreas Dilger
2017-04-20 5:43 ` Amir Goldstein
2017-04-20 8:45 ` Miklos Szeredi
2017-04-20 8:47 ` Miklos Szeredi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1492387183-18847-9-git-send-email-amir73il@gmail.com \
--to=amir73il@gmail.com \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-unionfs@vger.kernel.org \
--cc=miklos@szeredi.hu \
--cc=viro@zeniv.linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox