summaryrefslogtreecommitdiff
path: root/fs/overlayfs/util.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/overlayfs/util.c')
-rw-r--r--fs/overlayfs/util.c13
1 files changed, 2 insertions, 11 deletions
diff --git a/fs/overlayfs/util.c b/fs/overlayfs/util.c
index 9665d6d3cb7f..0217094c23ea 100644
--- a/fs/overlayfs/util.c
+++ b/fs/overlayfs/util.c
@@ -65,18 +65,9 @@ const struct cred *ovl_override_creds(struct super_block *sb)
{
struct ovl_fs *ofs = OVL_FS(sb);
- if (!ofs->config.override_creds)
- return NULL;
return override_creds(ofs->creator_cred);
}
-void ovl_revert_creds(struct super_block *sb, const struct cred *old_cred)
-{
- if (old_cred)
- revert_creds(old_cred);
-}
-
-
/*
* Check if underlying fs supports file handles and try to determine encoding
* type, in order to deduce maximum inode number used by fs.
@@ -1174,7 +1165,7 @@ int ovl_nlink_start(struct dentry *dentry)
* value relative to the upper inode nlink in an upper inode xattr.
*/
err = ovl_set_nlink_upper(dentry);
- ovl_revert_creds(dentry->d_sb, old_cred);
+ revert_creds(old_cred);
if (err)
goto out_drop_write;
@@ -1199,7 +1190,7 @@ void ovl_nlink_end(struct dentry *dentry)
old_cred = ovl_override_creds(dentry->d_sb);
ovl_cleanup_index(dentry);
- ovl_revert_creds(dentry->d_sb, old_cred);
+ revert_creds(old_cred);
}
ovl_inode_unlock(inode);