Skip to content

Commit d06ffd6

Browse files
vcgomesamir73il
authored andcommitted
fs/backing-file: Convert to revert/override_creds_light()
As the credentials used by backing-file are long lived in relation to the critical section (override_creds() -> revert_creds()) we can replace them by their lighter alternatives. Signed-off-by: Vinicius Costa Gomes <[email protected]> Signed-off-by: Amir Goldstein <[email protected]>
1 parent 49dffdf commit d06ffd6

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

fs/backing-file.c

Lines changed: 10 additions & 10 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(ctx->cred);
179+
old_cred = override_creds_light(ctx->cred);
180180
if (is_sync_kiocb(iocb)) {
181181
rwf_t rwf = iocb_to_rw_flags(flags);
182182

@@ -197,7 +197,7 @@ ssize_t backing_file_read_iter(struct file *file, struct iov_iter *iter,
197197
backing_aio_cleanup(aio, ret);
198198
}
199199
out:
200-
revert_creds(old_cred);
200+
revert_creds_light(old_cred);
201201

202202
if (ctx->accessed)
203203
ctx->accessed(iocb->ki_filp);
@@ -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(ctx->cred);
236+
old_cred = override_creds_light(ctx->cred);
237237
if (is_sync_kiocb(iocb)) {
238238
rwf_t rwf = iocb_to_rw_flags(flags);
239239

@@ -264,7 +264,7 @@ ssize_t backing_file_write_iter(struct file *file, struct iov_iter *iter,
264264
backing_aio_cleanup(aio, ret);
265265
}
266266
out:
267-
revert_creds(old_cred);
267+
revert_creds_light(old_cred);
268268

269269
return ret;
270270
}
@@ -281,9 +281,9 @@ 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(ctx->cred);
284+
old_cred = override_creds_light(ctx->cred);
285285
ret = vfs_splice_read(in, &iocb->ki_pos, pipe, len, flags);
286-
revert_creds(old_cred);
286+
revert_creds_light(old_cred);
287287

288288
if (ctx->accessed)
289289
ctx->accessed(iocb->ki_filp);
@@ -310,11 +310,11 @@ ssize_t backing_file_splice_write(struct pipe_inode_info *pipe,
310310
if (ret)
311311
return ret;
312312

313-
old_cred = override_creds(ctx->cred);
313+
old_cred = override_creds_light(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);
317-
revert_creds(old_cred);
317+
revert_creds_light(old_cred);
318318

319319
if (ctx->end_write)
320320
ctx->end_write(iocb, ret);
@@ -337,9 +337,9 @@ int backing_file_mmap(struct file *file, struct vm_area_struct *vma,
337337

338338
vma_set_file(vma, file);
339339

340-
old_cred = override_creds(ctx->cred);
340+
old_cred = override_creds_light(ctx->cred);
341341
ret = call_mmap(vma->vm_file, vma);
342-
revert_creds(old_cred);
342+
revert_creds_light(old_cred);
343343

344344
if (ctx->accessed)
345345
ctx->accessed(vma->vm_file);

0 commit comments

Comments
 (0)