diff options
| author | Miklos Szeredi <mszeredi@redhat.com> | 2017-07-04 23:03:16 +0300 |
|---|---|---|
| committer | Miklos Szeredi <mszeredi@redhat.com> | 2017-07-04 23:03:16 +0300 |
| commit | e6d2ebddbc5205635a021a910f2f0e93bc2aa534 (patch) | |
| tree | 93bf64fc3ce1e310cdb43b61be9bc51fbe59bb0d /fs/overlayfs/namei.c | |
| parent | 13cf199d0088b77ab08a9594df2e73e775317ed2 (diff) | |
| download | linux-e6d2ebddbc5205635a021a910f2f0e93bc2aa534.tar.xz | |
ovl: simplify getting inode
Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
Diffstat (limited to 'fs/overlayfs/namei.c')
| -rw-r--r-- | fs/overlayfs/namei.c | 30 |
1 files changed, 9 insertions, 21 deletions
diff --git a/fs/overlayfs/namei.c b/fs/overlayfs/namei.c index de0d4f742f36..0072ca5d5dac 100644 --- a/fs/overlayfs/namei.c +++ b/fs/overlayfs/namei.c @@ -433,41 +433,29 @@ struct dentry *ovl_lookup(struct inode *dir, struct dentry *dentry, if (!oe) goto out_put; - if (upperdentry || ctr) { - struct dentry *realdentry; - struct inode *realinode; - - realdentry = upperdentry ? upperdentry : stack[0].dentry; - realinode = d_inode(realdentry); + oe->opaque = upperopaque; + oe->impure = upperimpure; + oe->redirect = upperredirect; + oe->__upperdentry = upperdentry; + memcpy(oe->lowerstack, stack, sizeof(struct path) * ctr); + dentry->d_fsdata = oe; + if (upperdentry || ctr) { err = -ENOMEM; - if (upperdentry && !d_is_dir(upperdentry)) { - inode = ovl_get_inode(dentry->d_sb, realinode); - } else { - inode = ovl_new_inode(dentry->d_sb, realinode->i_mode, - realinode->i_rdev); - if (inode) - ovl_inode_init(inode, realinode, !!upperdentry); - } + inode = ovl_get_inode(dentry); if (!inode) goto out_free_oe; - ovl_copyattr(realdentry->d_inode, inode); } revert_creds(old_cred); - oe->opaque = upperopaque; - oe->impure = upperimpure; - oe->redirect = upperredirect; - oe->__upperdentry = upperdentry; - memcpy(oe->lowerstack, stack, sizeof(struct path) * ctr); kfree(stack); kfree(d.redirect); - dentry->d_fsdata = oe; d_add(dentry, inode); return NULL; out_free_oe: + dentry->d_fsdata = NULL; kfree(oe); out_put: for (i = 0; i < ctr; i++) |