Skip to content

Commit 6771e00

Browse files
committed
tree-wide: s/override_creds_light()/override_creds()/g
Rename all calls to override_creds_light() back to overrid_creds(). Link: https://lore.kernel.org/r/[email protected] Reviewed-by: Jeff Layton <[email protected]> Reviewed-by: Jens Axboe <[email protected]> Signed-off-by: Christian Brauner <[email protected]>
1 parent a51a1d6 commit 6771e00

File tree

27 files changed

+33
-33
lines changed

27 files changed

+33
-33
lines changed

drivers/base/firmware_loader/main.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -911,7 +911,7 @@ _request_firmware(const struct firmware **firmware_p, const char *name,
911911
ret = -ENOMEM;
912912
goto out;
913913
}
914-
old_cred = override_creds_light(get_new_cred(kern_cred));
914+
old_cred = override_creds(get_new_cred(kern_cred));
915915

916916
ret = fw_get_filesystem_firmware(device, fw->priv, "", NULL);
917917

drivers/crypto/ccp/sev-dev.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ static struct file *open_file_as_root(const char *filename, int flags, umode_t m
244244
if (!cred)
245245
return ERR_PTR(-ENOMEM);
246246
cred->fsuid = GLOBAL_ROOT_UID;
247-
old_cred = override_creds_light(get_new_cred(cred));
247+
old_cred = override_creds(get_new_cred(cred));
248248

249249
fp = file_open_root(&root, filename, flags, mode);
250250
path_put(&root);

drivers/target/target_core_configfs.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3756,7 +3756,7 @@ static int __init target_core_init_configfs(void)
37563756
ret = -ENOMEM;
37573757
goto out;
37583758
}
3759-
old_cred = override_creds_light(get_new_cred(kern_cred));
3759+
old_cred = override_creds(get_new_cred(kern_cred));
37603760
target_init_dbroot();
37613761
put_cred(revert_creds_light(old_cred));
37623762
put_cred(kern_cred);

fs/aio.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1639,7 +1639,7 @@ static int aio_write(struct kiocb *req, const struct iocb *iocb,
16391639
static void aio_fsync_work(struct work_struct *work)
16401640
{
16411641
struct aio_kiocb *iocb = container_of(work, struct aio_kiocb, fsync.work);
1642-
const struct cred *old_cred = override_creds_light(get_new_cred(iocb->fsync.creds));
1642+
const struct cred *old_cred = override_creds(get_new_cred(iocb->fsync.creds));
16431643

16441644
iocb->ki_res.res = vfs_fsync(iocb->fsync.file, iocb->fsync.datasync);
16451645
put_cred(revert_creds_light(old_cred));

fs/backing-file.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ ssize_t backing_file_read_iter(struct file *file, struct iov_iter *iter,
176176
!(file->f_mode & FMODE_CAN_ODIRECT))
177177
return -EINVAL;
178178

179-
old_cred = override_creds_light(ctx->cred);
179+
old_cred = override_creds(ctx->cred);
180180
if (is_sync_kiocb(iocb)) {
181181
rwf_t rwf = iocb_to_rw_flags(flags);
182182

@@ -233,7 +233,7 @@ ssize_t backing_file_write_iter(struct file *file, struct iov_iter *iter,
233233
*/
234234
flags &= ~IOCB_DIO_CALLER_COMP;
235235

236-
old_cred = override_creds_light(ctx->cred);
236+
old_cred = override_creds(ctx->cred);
237237
if (is_sync_kiocb(iocb)) {
238238
rwf_t rwf = iocb_to_rw_flags(flags);
239239

@@ -281,7 +281,7 @@ ssize_t backing_file_splice_read(struct file *in, struct kiocb *iocb,
281281
if (WARN_ON_ONCE(!(in->f_mode & FMODE_BACKING)))
282282
return -EIO;
283283

284-
old_cred = override_creds_light(ctx->cred);
284+
old_cred = override_creds(ctx->cred);
285285
ret = vfs_splice_read(in, &iocb->ki_pos, pipe, len, flags);
286286
revert_creds_light(old_cred);
287287

@@ -310,7 +310,7 @@ ssize_t backing_file_splice_write(struct pipe_inode_info *pipe,
310310
if (ret)
311311
return ret;
312312

313-
old_cred = override_creds_light(ctx->cred);
313+
old_cred = override_creds(ctx->cred);
314314
file_start_write(out);
315315
ret = out->f_op->splice_write(pipe, out, &iocb->ki_pos, len, flags);
316316
file_end_write(out);
@@ -338,7 +338,7 @@ int backing_file_mmap(struct file *file, struct vm_area_struct *vma,
338338

339339
vma_set_file(vma, file);
340340

341-
old_cred = override_creds_light(ctx->cred);
341+
old_cred = override_creds(ctx->cred);
342342
ret = call_mmap(vma->vm_file, vma);
343343
revert_creds_light(old_cred);
344344

fs/binfmt_misc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -829,7 +829,7 @@ static ssize_t bm_register_write(struct file *file, const char __user *buffer,
829829
* didn't matter much as only a privileged process could open
830830
* the register file.
831831
*/
832-
old_cred = override_creds_light(get_new_cred(file->f_cred));
832+
old_cred = override_creds(get_new_cred(file->f_cred));
833833
f = open_exec(e->interpreter);
834834
put_cred(revert_creds_light(old_cred));
835835
if (IS_ERR(f)) {

fs/cachefiles/internal.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -393,7 +393,7 @@ extern int cachefiles_determine_cache_security(struct cachefiles_cache *cache,
393393
static inline void cachefiles_begin_secure(struct cachefiles_cache *cache,
394394
const struct cred **_saved_cred)
395395
{
396-
*_saved_cred = override_creds_light(get_new_cred(cache->cache_cred));
396+
*_saved_cred = override_creds(get_new_cred(cache->cache_cred));
397397
}
398398

399399
static inline void cachefiles_end_secure(struct cachefiles_cache *cache,

fs/coredump.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -576,7 +576,7 @@ void do_coredump(const kernel_siginfo_t *siginfo)
576576
if (retval < 0)
577577
goto fail_creds;
578578

579-
old_cred = override_creds_light(get_new_cred(cred));
579+
old_cred = override_creds(get_new_cred(cred));
580580

581581
ispipe = format_corename(&cn, &cprm, &argv, &argc);
582582

fs/nfs/localio.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -374,7 +374,7 @@ static void nfs_local_call_read(struct work_struct *work)
374374
struct iov_iter iter;
375375
ssize_t status;
376376

377-
save_cred = override_creds_light(get_new_cred(filp->f_cred));
377+
save_cred = override_creds(get_new_cred(filp->f_cred));
378378

379379
nfs_local_iter_init(&iter, iocb, READ);
380380

@@ -545,7 +545,7 @@ static void nfs_local_call_write(struct work_struct *work)
545545
ssize_t status;
546546

547547
current->flags |= PF_LOCAL_THROTTLE | PF_MEMALLOC_NOIO;
548-
save_cred = override_creds_light(get_new_cred(filp->f_cred));
548+
save_cred = override_creds(get_new_cred(filp->f_cred));
549549

550550
nfs_local_iter_init(&iter, iocb, WRITE);
551551

fs/nfs/nfs4idmap.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,7 @@ static ssize_t nfs_idmap_get_key(const char *name, size_t namelen,
311311
const struct user_key_payload *payload;
312312
ssize_t ret;
313313

314-
saved_cred = override_creds_light(get_new_cred(id_resolver_cache));
314+
saved_cred = override_creds(get_new_cred(id_resolver_cache));
315315
rkey = nfs_idmap_request_key(name, namelen, type, idmap);
316316
put_cred(revert_creds_light(saved_cred));
317317

0 commit comments

Comments
 (0)