diff options
| author | Miklos Szeredi <mszeredi@redhat.com> | 2017-07-04 22:03:16 +0200 |
|---|---|---|
| committer | Miklos Szeredi <mszeredi@redhat.com> | 2017-07-04 22:03:16 +0200 |
| commit | 09d8b586731bf589655c2ac971532c14cf272b63 (patch) | |
| tree | 5acbbdb16f462e772083c847e54f82ef68c9727f /fs/overlayfs/inode.c | |
| parent | 9020df37207867272e590a416c2fb3da0e5383c6 (diff) | |
| download | linux-stable-09d8b586731bf589655c2ac971532c14cf272b63.tar.gz linux-stable-09d8b586731bf589655c2ac971532c14cf272b63.tar.bz2 linux-stable-09d8b586731bf589655c2ac971532c14cf272b63.zip | |
ovl: move __upperdentry to ovl_inode
Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
Diffstat (limited to 'fs/overlayfs/inode.c')
| -rw-r--r-- | fs/overlayfs/inode.c | 26 |
1 files changed, 17 insertions, 9 deletions
diff --git a/fs/overlayfs/inode.c b/fs/overlayfs/inode.c index 4c30d44905ef..4654c03dd508 100644 --- a/fs/overlayfs/inode.c +++ b/fs/overlayfs/inode.c @@ -134,8 +134,8 @@ out: int ovl_permission(struct inode *inode, int mask) { - bool is_upper; - struct inode *realinode = ovl_inode_real(inode, &is_upper); + struct inode *upperinode = ovl_inode_upper(inode); + struct inode *realinode = upperinode ?: ovl_inode_lower(inode); const struct cred *old_cred; int err; @@ -154,7 +154,8 @@ int ovl_permission(struct inode *inode, int mask) return err; old_cred = ovl_override_creds(inode->i_sb); - if (!is_upper && !special_file(realinode->i_mode) && mask & MAY_WRITE) { + if (!upperinode && + !special_file(realinode->i_mode) && mask & MAY_WRITE) { mask &= ~(MAY_WRITE | MAY_APPEND); /* Make sure mounter can read file for copy up later */ mask |= MAY_READ; @@ -286,7 +287,7 @@ ssize_t ovl_listxattr(struct dentry *dentry, char *list, size_t size) struct posix_acl *ovl_get_acl(struct inode *inode, int type) { - struct inode *realinode = ovl_inode_real(inode, NULL); + struct inode *realinode = ovl_inode_real(inode); const struct cred *old_cred; struct posix_acl *acl; @@ -462,17 +463,24 @@ static int ovl_inode_set(struct inode *inode, void *data) return 0; } -struct inode *ovl_get_inode(struct dentry *dentry) +struct inode *ovl_get_inode(struct dentry *dentry, struct dentry *upperdentry) { - struct dentry *upperdentry = ovl_dentry_upper(dentry); - struct inode *realinode = d_inode(ovl_dentry_real(dentry)); + struct dentry *lowerdentry = ovl_dentry_lower(dentry); + struct inode *realinode = upperdentry ? d_inode(upperdentry) : NULL; struct inode *inode; + if (!realinode) + realinode = d_inode(lowerdentry); + if (upperdentry && !d_is_dir(upperdentry)) { inode = iget5_locked(dentry->d_sb, (unsigned long) realinode, ovl_inode_test, ovl_inode_set, realinode); - if (!inode || !(inode->i_state & I_NEW)) + if (!inode) goto out; + if (!(inode->i_state & I_NEW)) { + dput(upperdentry); + goto out; + } set_nlink(inode, realinode->i_nlink); } else { @@ -481,7 +489,7 @@ struct inode *ovl_get_inode(struct dentry *dentry) goto out; } ovl_fill_inode(inode, realinode->i_mode, realinode->i_rdev); - ovl_inode_init(inode, dentry); + ovl_inode_init(inode, upperdentry, lowerdentry); if (inode->i_state & I_NEW) unlock_new_inode(inode); out: |