Use the scoped ovl cred guard. Signed-off-by: Christian Brauner --- fs/overlayfs/super.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/fs/overlayfs/super.c b/fs/overlayfs/super.c index 6876406c120a..260b393a1916 100644 --- a/fs/overlayfs/super.c +++ b/fs/overlayfs/super.c @@ -1545,7 +1545,6 @@ static int do_ovl_fill_super(struct super_block *sb, struct ovl_fs *ofs, int ovl_fill_super(struct super_block *sb, struct fs_context *fc) { struct ovl_fs *ofs = sb->s_fs_info; - const struct cred *old_cred = NULL; struct cred *cred; int err; @@ -1563,11 +1562,8 @@ int ovl_fill_super(struct super_block *sb, struct fs_context *fc) if (!cred) goto out_err; - old_cred = ovl_override_creds(sb); - - err = do_ovl_fill_super(sb, ofs, fc); - - ovl_revert_creds(old_cred); + with_ovl_creds(sb) + err = do_ovl_fill_super(sb, ofs, fc); out_err: if (err) { -- 2.47.3