Skip to content

Commit 2b315ed

Browse files
committed
cifs: avoid pointless cred reference count bump
During module init root_cred will be allocated with its own reference which is only destroyed during module exit. 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 6077c46 commit 2b315ed

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

fs/smb/client/cifsacl.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,7 @@ id_to_sid(unsigned int cid, uint sidtype, struct smb_sid *ssid)
292292
return -EINVAL;
293293

294294
rc = 0;
295-
saved_cred = override_creds(get_new_cred(root_cred));
295+
saved_cred = override_creds(root_cred);
296296
sidkey = request_key(&cifs_idmap_key_type, desc, "");
297297
if (IS_ERR(sidkey)) {
298298
rc = -EINVAL;
@@ -327,7 +327,7 @@ id_to_sid(unsigned int cid, uint sidtype, struct smb_sid *ssid)
327327
out_key_put:
328328
key_put(sidkey);
329329
out_revert_creds:
330-
put_cred(revert_creds(saved_cred));
330+
revert_creds(saved_cred);
331331
return rc;
332332

333333
invalidate_key:
@@ -398,7 +398,7 @@ sid_to_id(struct cifs_sb_info *cifs_sb, struct smb_sid *psid,
398398
if (!sidstr)
399399
return -ENOMEM;
400400

401-
saved_cred = override_creds(get_new_cred(root_cred));
401+
saved_cred = override_creds(root_cred);
402402
sidkey = request_key(&cifs_idmap_key_type, sidstr, "");
403403
if (IS_ERR(sidkey)) {
404404
cifs_dbg(FYI, "%s: Can't map SID %s to a %cid\n",
@@ -438,7 +438,7 @@ sid_to_id(struct cifs_sb_info *cifs_sb, struct smb_sid *psid,
438438
out_key_put:
439439
key_put(sidkey);
440440
out_revert_creds:
441-
put_cred(revert_creds(saved_cred));
441+
revert_creds(saved_cred);
442442
kfree(sidstr);
443443

444444
/*

0 commit comments

Comments
 (0)