tree-wide: s/revert_creds_light()/revert_creds()/g

Rename all calls to revert_creds_light() back to revert_creds().

Link: https://lore.kernel.org/r/20241125-work-cred-v2-6-68b9d38bb5b2@kernel.org
Reviewed-by: Jeff Layton <jlayton@kernel.org>
Reviewed-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Christian Brauner <brauner@kernel.org>

diff --git a/drivers/base/firmware_loader/main.c b/drivers/base/firmware_loader/main.c
index 294c75025dcb2577b5df64bf771ea0c1e82d5582..a97fa36ee4bd6be09d43ed48719ba40b4d8d2591 100644 (file)
--- a/drivers/base/firmware_loader/main.c
+++ b/drivers/base/firmware_loader/main.c
@@ -943,7 +943,7 @@ _request_firmware(const struct firmware **firmware_p, const char *name,
        } else
                ret = assign_fw(fw, device);
 
-       put_cred(revert_creds_light(old_cred));
+       put_cred(revert_creds(old_cred));
        put_cred(kern_cred);
 
 out:

diff --git a/drivers/crypto/ccp/sev-dev.c b/drivers/crypto/ccp/sev-dev.c
index ffae20fd52bc03e7123b116251c77a3ccd7c6cde..187c34b02442dd50640f88713bc5f6f88a1990f4 100644 (file)
--- a/drivers/crypto/ccp/sev-dev.c
+++ b/drivers/crypto/ccp/sev-dev.c
@@ -249,7 +249,7 @@ static struct file *open_file_as_root(const char *filename, int flags, umode_t m
        fp = file_open_root(&root, filename, flags, mode);
        path_put(&root);
 
-       put_cred(revert_creds_light(old_cred));
+       put_cred(revert_creds(old_cred));
 
        return fp;
 }

diff --git a/drivers/target/target_core_configfs.c b/drivers/target/target_core_configfs.c
index 7788e1fe2633ded4f265ff874c62dc4a21fd1b6e..ec7a5598719397da5cadfed12a05ca8eb81e46a9 100644 (file)
--- a/drivers/target/target_core_configfs.c
+++ b/drivers/target/target_core_configfs.c
@@ -3758,7 +3758,7 @@ static int __init target_core_init_configfs(void)
        }
        old_cred = override_creds(get_new_cred(kern_cred));
        target_init_dbroot();
-       put_cred(revert_creds_light(old_cred));
+       put_cred(revert_creds(old_cred));
        put_cred(kern_cred);
 
        return 0;

diff --git a/fs/aio.c b/fs/aio.c
index 7e0ec687f480c05358c6c40638a7e187aafd8124..5e57dcaed7f1ae1e4b38009b51a665954b31f5bd 100644 (file)
--- a/fs/aio.c
+++ b/fs/aio.c
@@ -1642,7 +1642,7 @@ static void aio_fsync_work(struct work_struct *work)
        const struct cred *old_cred = override_creds(get_new_cred(iocb->fsync.creds));
 
        iocb->ki_res.res = vfs_fsync(iocb->fsync.file, iocb->fsync.datasync);
-       put_cred(revert_creds_light(old_cred));
+       put_cred(revert_creds(old_cred));
        put_cred(iocb->fsync.creds);
        iocb_put(iocb);
 }

diff --git a/fs/backing-file.c b/fs/backing-file.c
index 37c5a66e5dadc9e5feea23e7ab07293afe888dce..763fbe9b72b22753a5b90ac673b10ebb2527403f 100644 (file)
--- a/fs/backing-file.c
+++ b/fs/backing-file.c
@@ -197,7 +197,7 @@ ssize_t backing_file_read_iter(struct file *file, struct iov_iter *iter,
                        backing_aio_cleanup(aio, ret);
        }
 out:
-       revert_creds_light(old_cred);
+       revert_creds(old_cred);
 
        if (ctx->accessed)
                ctx->accessed(iocb->ki_filp);
@@ -264,7 +264,7 @@ ssize_t backing_file_write_iter(struct file *file, struct iov_iter *iter,
                        backing_aio_cleanup(aio, ret);
        }
 out:
-       revert_creds_light(old_cred);
+       revert_creds(old_cred);
 
        return ret;
 }
@@ -283,7 +283,7 @@ ssize_t backing_file_splice_read(struct file *in, struct kiocb *iocb,
 
        old_cred = override_creds(ctx->cred);
        ret = vfs_splice_read(in, &iocb->ki_pos, pipe, len, flags);
-       revert_creds_light(old_cred);
+       revert_creds(old_cred);
 
        if (ctx->accessed)
                ctx->accessed(iocb->ki_filp);
@@ -314,7 +314,7 @@ ssize_t backing_file_splice_write(struct pipe_inode_info *pipe,
        file_start_write(out);
        ret = out->f_op->splice_write(pipe, out, &iocb->ki_pos, len, flags);
        file_end_write(out);
-       revert_creds_light(old_cred);
+       revert_creds(old_cred);
 
        if (ctx->end_write)
                ctx->end_write(iocb, ret);
@@ -340,7 +340,7 @@ int backing_file_mmap(struct file *file, struct vm_area_struct *vma,
 
        old_cred = override_creds(ctx->cred);
        ret = call_mmap(vma->vm_file, vma);
-       revert_creds_light(old_cred);
+       revert_creds(old_cred);
 
        if (ctx->accessed)
                ctx->accessed(user_file);

diff --git a/fs/binfmt_misc.c b/fs/binfmt_misc.c
index 5756ec49f79e08342ce5607f85fd576496a86bcd..3270c2158552b7a7a16c948d1f0f2727478beaa7 100644 (file)
--- a/fs/binfmt_misc.c
+++ b/fs/binfmt_misc.c
@@ -831,7 +831,7 @@ static ssize_t bm_register_write(struct file *file, const char __user *buffer,
                 */
                old_cred = override_creds(get_new_cred(file->f_cred));
                f = open_exec(e->interpreter);
-               put_cred(revert_creds_light(old_cred));
+               put_cred(revert_creds(old_cred));
                if (IS_ERR(f)) {
                        pr_notice("register: failed to install interpreter file %s\n",
                                 e->interpreter);

diff --git a/fs/cachefiles/internal.h b/fs/cachefiles/internal.h
index 05b1d4cfb55afefd025c5f9c08afa81f67fdb9eb..1cfeb3b3831900b7c389c55c59fc7e3b84acfca6 100644 (file)
--- a/fs/cachefiles/internal.h
+++ b/fs/cachefiles/internal.h
@@ -399,7 +399,7 @@ static inline void cachefiles_begin_secure(struct cachefiles_cache *cache,
 static inline void cachefiles_end_secure(struct cachefiles_cache *cache,
                                         const struct cred *saved_cred)
 {
-       put_cred(revert_creds_light(saved_cred));
+       put_cred(revert_creds(saved_cred));
 }
 
 /*

diff --git a/fs/coredump.c b/fs/coredump.c
index 4eae37892da58e982b53da4596952a1b3d2e1630..0d3a65cac546db6710eb1337b0a9c4ec0ffff679 100644 (file)
--- a/fs/coredump.c
+++ b/fs/coredump.c
@@ -781,7 +781,7 @@ fail_unlock:
        kfree(argv);
        kfree(cn.corename);
        coredump_finish(core_dumped);
-       put_cred(revert_creds_light(old_cred));
+       put_cred(revert_creds(old_cred));
 fail_creds:
        put_cred(cred);
 fail:

diff --git a/fs/nfs/localio.c b/fs/nfs/localio.c
index 682d951ed69adc6a0a7e595a2fb4f9fe4437bae1..720a4a99bd8ab4314d93bf87074d03c54b98795e 100644 (file)
--- a/fs/nfs/localio.c
+++ b/fs/nfs/localio.c
@@ -384,7 +384,7 @@ static void nfs_local_call_read(struct work_struct *work)
        nfs_local_read_done(iocb, status);
        nfs_local_pgio_release(iocb);
 
-       put_cred(revert_creds_light(save_cred));
+       put_cred(revert_creds(save_cred));
 }
 
 static int
@@ -558,7 +558,7 @@ static void nfs_local_call_write(struct work_struct *work)
        nfs_local_vfs_getattr(iocb);
        nfs_local_pgio_release(iocb);
 
-       put_cred(revert_creds_light(save_cred));
+       put_cred(revert_creds(save_cred));
        current->flags = old_flags;
 }
 

diff --git a/fs/nfs/nfs4idmap.c b/fs/nfs/nfs4idmap.c
index 3cae4057f8ba30914a91a3d368ace8f52175644d..25b6a8920a6545d43f437f2f0330ccc35380ccc3 100644 (file)
--- a/fs/nfs/nfs4idmap.c
+++ b/fs/nfs/nfs4idmap.c
@@ -313,7 +313,7 @@ static ssize_t nfs_idmap_get_key(const char *name, size_t namelen,
 
        saved_cred = override_creds(get_new_cred(id_resolver_cache));
        rkey = nfs_idmap_request_key(name, namelen, type, idmap);
-       put_cred(revert_creds_light(saved_cred));
+       put_cred(revert_creds(saved_cred));
 
        if (IS_ERR(rkey)) {
                ret = PTR_ERR(rkey);

diff --git a/fs/nfsd/auth.c b/fs/nfsd/auth.c
index dafea9183b4e6413d61c0c83a1b8f26a9712d5c6..c399a5f030afbde6ad7bc9cf28f1e354d74db9a8 100644 (file)
--- a/fs/nfsd/auth.c
+++ b/fs/nfsd/auth.c
@@ -27,7 +27,7 @@ int nfsd_setuser(struct svc_cred *cred, struct svc_export *exp)
        int flags = nfsexp_flags(cred, exp);
 
        /* discard any old override before preparing the new set */
-       put_cred(revert_creds_light(get_cred(current_real_cred())));
+       put_cred(revert_creds(get_cred(current_real_cred())));
        new = prepare_creds();
        if (!new)
                return -ENOMEM;

diff --git a/fs/nfsd/filecache.c b/fs/nfsd/filecache.c
index c05cd2ae81394ff1d807769df5b611695ed771e4..dc5c9d8e8202d5ca8fa72bc8f3912c62c485e076 100644 (file)
--- a/fs/nfsd/filecache.c
+++ b/fs/nfsd/filecache.c
@@ -1248,7 +1248,7 @@ nfsd_file_acquire_local(struct net *net, struct svc_cred *cred,
 
        beres = nfsd_file_do_acquire(NULL, net, cred, client,
                                     fhp, may_flags, NULL, pnf, true);
-       put_cred(revert_creds_light(save_cred));
+       put_cred(revert_creds(save_cred));
        return beres;
 }
 

diff --git a/fs/nfsd/nfs4recover.c b/fs/nfsd/nfs4recover.c
index 0ab22b4e940fe9bcf587d9134e91975e44243e11..f3837167b6a14cf925982ca87fa9f59bfbc56bca 100644 (file)
--- a/fs/nfsd/nfs4recover.c
+++ b/fs/nfsd/nfs4recover.c
@@ -89,7 +89,7 @@ nfs4_save_creds(const struct cred **original_creds)
 static void
 nfs4_reset_creds(const struct cred *original)
 {
-       put_cred(revert_creds_light(original));
+       put_cred(revert_creds(original));
 }
 
 static void

diff --git a/fs/open.c b/fs/open.c
index bd0a34653f0ebe210ddfeabf5ea3bc002bf2833d..0a5cd8e74fb9bb4cc484d84096c6123b21acbf16 100644 (file)
--- a/fs/open.c
+++ b/fs/open.c
@@ -523,7 +523,7 @@ out_path_release:
        }
 out:
        if (old_cred)
-               put_cred(revert_creds_light(old_cred));
+               put_cred(revert_creds(old_cred));
 
        return res;
 }

diff --git a/fs/overlayfs/copy_up.c b/fs/overlayfs/copy_up.c
index 7805667b2e05264c011cd41ff6f77b9ae0fb30d9..439bd9a5ceecc4d2f4dc5dfda7cea14c3d9411ba 100644 (file)
--- a/fs/overlayfs/copy_up.c
+++ b/fs/overlayfs/copy_up.c
@@ -749,7 +749,7 @@ static int ovl_prep_cu_creds(struct dentry *dentry, struct ovl_cu_creds *cc)
 static void ovl_revert_cu_creds(struct ovl_cu_creds *cc)
 {
        if (cc->new) {
-               put_cred(revert_creds_light(cc->old));
+               put_cred(revert_creds(cc->old));
                put_cred(cc->new);
        }
 }

diff --git a/fs/overlayfs/dir.c b/fs/overlayfs/dir.c
index 151271f0586c7249cfa61cd45d249ec930adaf82..c9993ff66fc26ec45ab5a5b4679d1d2056a01df2 100644 (file)
--- a/fs/overlayfs/dir.c
+++ b/fs/overlayfs/dir.c
@@ -575,7 +575,7 @@ static const struct cred *ovl_setup_cred_for_create(struct dentry *dentry,
        }
 
        /*
-        * Caller is going to match this with revert_creds_light() and drop
+        * Caller is going to match this with revert_creds() and drop
         * referenec on the returned creds.
         * We must be called with creator creds already, otherwise we risk
         * leaking creds.

diff --git a/fs/overlayfs/util.c b/fs/overlayfs/util.c
index 2513a79a10b0bd69fa9d1c8a0f4726f3246ac39c..0819c739cc2ffce0dfefa84d3ff8f9f103eec191 100644 (file)
--- a/fs/overlayfs/util.c
+++ b/fs/overlayfs/util.c
@@ -70,7 +70,7 @@ const struct cred *ovl_override_creds(struct super_block *sb)
 
 void ovl_revert_creds(const struct cred *old_cred)
 {
-       revert_creds_light(old_cred);
+       revert_creds(old_cred);
 }
 
 /*

diff --git a/fs/smb/client/cifs_spnego.c b/fs/smb/client/cifs_spnego.c
index f22dc0be357fa03cecc524976de5c69fddeef1ca..6284d924fdb1e25e07af7e10b6286df97c0942dd 100644 (file)
--- a/fs/smb/client/cifs_spnego.c
+++ b/fs/smb/client/cifs_spnego.c
@@ -175,7 +175,7 @@ cifs_get_spnego_key(struct cifs_ses *sesInfo,
        cifs_dbg(FYI, "key description = %s\n", description);
        saved_cred = override_creds(get_new_cred(spnego_cred));
        spnego_key = request_key(&cifs_spnego_key_type, description, "");
-       put_cred(revert_creds_light(saved_cred));
+       put_cred(revert_creds(saved_cred));
 
 #ifdef CONFIG_CIFS_DEBUG2
        if (cifsFYI && !IS_ERR(spnego_key)) {

diff --git a/fs/smb/client/cifsacl.c b/fs/smb/client/cifsacl.c
index d65e094b97cb2b1bd1c79d1959443fd8cae93f8f..5718906369a96fc80bee6a472f93bac1159f1709 100644 (file)
--- a/fs/smb/client/cifsacl.c
+++ b/fs/smb/client/cifsacl.c
@@ -327,7 +327,7 @@ id_to_sid(unsigned int cid, uint sidtype, struct smb_sid *ssid)
 out_key_put:
        key_put(sidkey);
 out_revert_creds:
-       put_cred(revert_creds_light(saved_cred));
+       put_cred(revert_creds(saved_cred));
        return rc;
 
 invalidate_key:
@@ -438,7 +438,7 @@ try_upcall_to_get_id:
 out_key_put:
        key_put(sidkey);
 out_revert_creds:
-       put_cred(revert_creds_light(saved_cred));
+       put_cred(revert_creds(saved_cred));
        kfree(sidstr);
 
        /*

diff --git a/fs/smb/server/smb_common.c b/fs/smb/server/smb_common.c
index 4a4cb9e4d45a711bfd87c53610e0a5ec0f636401..ec4106aa19456fd928bba1e968ed56b93925ca6a 100644 (file)
--- a/fs/smb/server/smb_common.c
+++ b/fs/smb/server/smb_common.c
@@ -800,7 +800,7 @@ void ksmbd_revert_fsids(struct ksmbd_work *work)
        WARN_ON(!work->saved_cred);
 
        cred = current_cred();
-       put_cred(revert_creds_light(work->saved_cred));
+       put_cred(revert_creds(work->saved_cred));
        put_cred(cred);
        work->saved_cred = NULL;
 }

diff --git a/include/linux/cred.h b/include/linux/cred.h
index a073e6163c4ea5a78fc950d834bffeab9c5ba2be..a7df1c759ef00a91ddf3fc448cf05dda843ea5b7 100644 (file)
--- a/include/linux/cred.h
+++ b/include/linux/cred.h
@@ -178,7 +178,7 @@ static inline const struct cred *override_creds(const struct cred *override_cred
        return old;
 }
 
-static inline const struct cred *revert_creds_light(const struct cred *revert_cred)
+static inline const struct cred *revert_creds(const struct cred *revert_cred)
 {
        const struct cred *override_cred = current->cred;
 

diff --git a/io_uring/io_uring.c b/io_uring/io_uring.c
index 5b1cc024deea09efc6e5b8b66fc5f8c685715afd..3e408c8442d49dc1579387fe38590039fb2c4b73 100644 (file)
--- a/io_uring/io_uring.c
+++ b/io_uring/io_uring.c
@@ -1739,7 +1739,7 @@ static int io_issue_sqe(struct io_kiocb *req, unsigned int issue_flags)
                audit_uring_exit(!ret, ret);
 
        if (creds)
-               put_cred(revert_creds_light(creds));
+               put_cred(revert_creds(creds));
 
        if (ret == IOU_OK) {
                if (issue_flags & IO_URING_F_COMPLETE_DEFER)

diff --git a/io_uring/sqpoll.c b/io_uring/sqpoll.c
index 0fd424442118f38db0307fe10e0c6ee102c1f185..1ca96347433695de1eb0e3bec7c6da4299e9ceb0 100644 (file)
--- a/io_uring/sqpoll.c
+++ b/io_uring/sqpoll.c
@@ -192,7 +192,7 @@ static int __io_sq_thread(struct io_ring_ctx *ctx, bool cap_entries)
                if (to_submit && wq_has_sleeper(&ctx->sqo_sq_wait))
                        wake_up(&ctx->sqo_sq_wait);
                if (creds)
-                       put_cred(revert_creds_light(creds));
+                       put_cred(revert_creds(creds));
        }
 
        return ret;

diff --git a/kernel/acct.c b/kernel/acct.c
index a51a3b483fd9d94da916dc4e052ef4ab1042a39f..ea8c94887b5853b10e7a7e632f7b0bc4d52ab10b 100644 (file)
--- a/kernel/acct.c
+++ b/kernel/acct.c
@@ -541,7 +541,7 @@ static void do_acct_process(struct bsd_acct_struct *acct)
        }
 out:
        current->signal->rlim[RLIMIT_FSIZE].rlim_cur = flim;
-       put_cred(revert_creds_light(orig_cred));
+       put_cred(revert_creds(orig_cred));
 }
 
 /**

diff --git a/kernel/cgroup/cgroup.c b/kernel/cgroup/cgroup.c
index 2d618b577e52e0117f77340dac79581882599578..1a94e8b154beeed45d69056917f3dd9fc6d950fa 100644 (file)
--- a/kernel/cgroup/cgroup.c
+++ b/kernel/cgroup/cgroup.c
@@ -5220,7 +5220,7 @@ static ssize_t __cgroup_procs_write(struct kernfs_open_file *of, char *buf,
        ret = cgroup_attach_permissions(src_cgrp, dst_cgrp,
                                        of->file->f_path.dentry->d_sb,
                                        threadgroup, ctx->ns);
-       put_cred(revert_creds_light(saved_cred));
+       put_cred(revert_creds(saved_cred));
        if (ret)
                goto out_finish;
 

diff --git a/kernel/trace/trace_events_user.c b/kernel/trace/trace_events_user.c
index 857124d81f1255e7e6b4d18009b53191a71b57fc..c54ae15f425c2c1dad3f8c776027beca2f00a0a5 100644 (file)
--- a/kernel/trace/trace_events_user.c
+++ b/kernel/trace/trace_events_user.c
@@ -1476,7 +1476,7 @@ static int user_event_set_call_visible(struct user_event *user, bool visible)
        else
                ret = trace_remove_event_call(&user->call);
 
-       put_cred(revert_creds_light(old_cred));
+       put_cred(revert_creds(old_cred));
        put_cred(cred);
 
        return ret;

diff --git a/net/dns_resolver/dns_query.c b/net/dns_resolver/dns_query.c
index f8749d688d6676dd83d0c4b8e83ca893f1bd4248..0b0789fe2194151102d5234aca3fc2dae9a1ed69 100644 (file)
--- a/net/dns_resolver/dns_query.c
+++ b/net/dns_resolver/dns_query.c
@@ -126,7 +126,7 @@ int dns_query(struct net *net,
         */
        saved_cred = override_creds(get_new_cred(dns_resolver_cache));
        rkey = request_key_net(&key_type_dns_resolver, desc, net, options);
-       put_cred(revert_creds_light(saved_cred));
+       put_cred(revert_creds(saved_cred));
        kfree(desc);
        if (IS_ERR(rkey)) {
                ret = PTR_ERR(rkey);