summaryrefslogtreecommitdiffstats
path: root/fs/overlayfs/copy_up.c
diff options
context:
space:
mode:
authorAmir Goldstein2018-05-16 16:35:02 +0200
committerMiklos Szeredi2018-05-31 11:06:10 +0200
commit471ec5dcf4e712ea81bf431a57c98d4b67416d30 (patch)
treed6e76dcc4899cded83e2bfce352d197fe5cfe1c0 /fs/overlayfs/copy_up.c
parentovl: strip debug argument from ovl_do_ helpers (diff)
downloadkernel-qcow2-linux-471ec5dcf4e712ea81bf431a57c98d4b67416d30.tar.gz
kernel-qcow2-linux-471ec5dcf4e712ea81bf431a57c98d4b67416d30.tar.xz
kernel-qcow2-linux-471ec5dcf4e712ea81bf431a57c98d4b67416d30.zip
ovl: struct cattr cleanups
* Rename to ovl_cattr * Fold ovl_create_real() hardlink argument into struct ovl_cattr * Create macro OVL_CATTR() to initialize struct ovl_cattr from mode Signed-off-by: Amir Goldstein <amir73il@gmail.com> Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
Diffstat (limited to 'fs/overlayfs/copy_up.c')
-rw-r--r--fs/overlayfs/copy_up.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/fs/overlayfs/copy_up.c b/fs/overlayfs/copy_up.c
index a8273dec0fb8..5f4c78b1bbeb 100644
--- a/fs/overlayfs/copy_up.c
+++ b/fs/overlayfs/copy_up.c
@@ -486,7 +486,7 @@ static int ovl_get_tmpfile(struct ovl_copy_up_ctx *c, struct dentry **tempp)
struct dentry *temp;
const struct cred *old_creds = NULL;
struct cred *new_creds = NULL;
- struct cattr cattr = {
+ struct ovl_cattr cattr = {
/* Can't properly set mode on creation because of the umask */
.mode = c->stat.mode & S_IFMT,
.rdev = c->stat.rdev,
@@ -509,8 +509,7 @@ static int ovl_get_tmpfile(struct ovl_copy_up_ctx *c, struct dentry **tempp)
if (IS_ERR(temp))
goto temp_err;
- err = ovl_create_real(d_inode(c->workdir), temp, &cattr,
- NULL);
+ err = ovl_create_real(d_inode(c->workdir), temp, &cattr);
if (err) {
dput(temp);
goto out;