Skip to content

Commit 48b5062

Browse files
Miklos Szerediamir73il
Miklos Szeredi
authored and
amir73il
committed
backing-file: clean up the API
 - Pass iocb to ctx->end_write() instead of file + pos - Get rid of ctx->user_file, which is redundant most of the time - Instead pass iocb to backing_file_splice_read and backing_file_splice_write Signed-off-by: Miklos Szeredi <mszeredi@redhat.com> Signed-off-by: Amir Goldstein <amir73il@gmail.com>
1 parent 3b6b99e commit 48b5062

4 files changed

Lines changed: 52 additions & 46 deletions

File tree

‎fs/backing-file.c‎

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ struct backing_aio {
8080
refcount_t ref;
8181
struct kiocb *orig_iocb;
8282
/* used for aio completion */
83-
void (*end_write)(struct file *, loff_t, ssize_t);
83+
void (*end_write)(struct kiocb *iocb, ssize_t);
8484
struct work_struct work;
8585
long res;
8686
};
@@ -108,10 +108,10 @@ static void backing_aio_cleanup(struct backing_aio *aio, long res)
108108
struct kiocb *iocb = &aio->iocb;
109109
struct kiocb *orig_iocb = aio->orig_iocb;
110110

111+
orig_iocb->ki_pos = iocb->ki_pos;
111112
if (aio->end_write)
112-
aio->end_write(orig_iocb->ki_filp, iocb->ki_pos, res);
113+
aio->end_write(orig_iocb, res);
113114

114-
orig_iocb->ki_pos = iocb->ki_pos;
115115
backing_aio_put(aio);
116116
}
117117

@@ -200,7 +200,7 @@ ssize_t backing_file_read_iter(struct file *file, struct iov_iter *iter,
200200
revert_creds(old_cred);
201201

202202
if (ctx->accessed)
203-
ctx->accessed(ctx->user_file);
203+
ctx->accessed(iocb->ki_filp);
204204

205205
return ret;
206206
}
@@ -219,7 +219,7 @@ ssize_t backing_file_write_iter(struct file *file, struct iov_iter *iter,
219219
if (!iov_iter_count(iter))
220220
return 0;
221221

222-
ret = file_remove_privs(ctx->user_file);
222+
ret = file_remove_privs(iocb->ki_filp);
223223
if (ret)
224224
return ret;
225225

@@ -239,7 +239,7 @@ ssize_t backing_file_write_iter(struct file *file, struct iov_iter *iter,
239239

240240
ret = vfs_iter_write(file, iter, &iocb->ki_pos, rwf);
241241
if (ctx->end_write)
242-
ctx->end_write(ctx->user_file, iocb->ki_pos, ret);
242+
ctx->end_write(iocb, ret);
243243
} else {
244244
struct backing_aio *aio;
245245

@@ -270,7 +270,7 @@ ssize_t backing_file_write_iter(struct file *file, struct iov_iter *iter,
270270
}
271271
EXPORT_SYMBOL_GPL(backing_file_write_iter);
272272

273-
ssize_t backing_file_splice_read(struct file *in, loff_t *ppos,
273+
ssize_t backing_file_splice_read(struct file *in, struct kiocb *iocb,
274274
struct pipe_inode_info *pipe, size_t len,
275275
unsigned int flags,
276276
struct backing_file_ctx *ctx)
@@ -282,19 +282,19 @@ ssize_t backing_file_splice_read(struct file *in, loff_t *ppos,
282282
return -EIO;
283283

284284
old_cred = override_creds(ctx->cred);
285-
ret = vfs_splice_read(in, ppos, pipe, len, flags);
285+
ret = vfs_splice_read(in, &iocb->ki_pos, pipe, len, flags);
286286
revert_creds(old_cred);
287287

288288
if (ctx->accessed)
289-
ctx->accessed(ctx->user_file);
289+
ctx->accessed(iocb->ki_filp);
290290

291291
return ret;
292292
}
293293
EXPORT_SYMBOL_GPL(backing_file_splice_read);
294294

295295
ssize_t backing_file_splice_write(struct pipe_inode_info *pipe,
296-
struct file *out, loff_t *ppos, size_t len,
297-
unsigned int flags,
296+
struct file *out, struct kiocb *iocb,
297+
size_t len, unsigned int flags,
298298
struct backing_file_ctx *ctx)
299299
{
300300
const struct cred *old_cred;
@@ -306,18 +306,18 @@ ssize_t backing_file_splice_write(struct pipe_inode_info *pipe,
306306
if (!out->f_op->splice_write)
307307
return -EINVAL;
308308

309-
ret = file_remove_privs(ctx->user_file);
309+
ret = file_remove_privs(iocb->ki_filp);
310310
if (ret)
311311
return ret;
312312

313313
old_cred = override_creds(ctx->cred);
314314
file_start_write(out);
315-
ret = out->f_op->splice_write(pipe, out, ppos, len, flags);
315+
ret = out->f_op->splice_write(pipe, out, &iocb->ki_pos, len, flags);
316316
file_end_write(out);
317317
revert_creds(old_cred);
318318

319319
if (ctx->end_write)
320-
ctx->end_write(ctx->user_file, ppos ? *ppos : 0, ret);
320+
ctx->end_write(iocb, ret);
321321

322322
return ret;
323323
}
@@ -329,8 +329,7 @@ int backing_file_mmap(struct file *file, struct vm_area_struct *vma,
329329
const struct cred *old_cred;
330330
int ret;
331331

332-
if (WARN_ON_ONCE(!(file->f_mode & FMODE_BACKING)) ||
333-
WARN_ON_ONCE(ctx->user_file != vma->vm_file))
332+
if (WARN_ON_ONCE(!(file->f_mode & FMODE_BACKING)))
334333
return -EIO;
335334

336335
if (!file->f_op->mmap)
@@ -343,7 +342,7 @@ int backing_file_mmap(struct file *file, struct vm_area_struct *vma,
343342
revert_creds(old_cred);
344343

345344
if (ctx->accessed)
346-
ctx->accessed(ctx->user_file);
345+
ctx->accessed(vma->vm_file);
347346

348347
return ret;
349348
}

‎fs/fuse/passthrough.c‎

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@ static void fuse_file_accessed(struct file *file)
1818
fuse_invalidate_atime(inode);
1919
}
2020

21-
static void fuse_passthrough_end_write(struct file *file, loff_t pos, ssize_t ret)
21+
static void fuse_passthrough_end_write(struct kiocb *iocb, ssize_t ret)
2222
{
23-
struct inode *inode = file_inode(file);
23+
struct inode *inode = file_inode(iocb->ki_filp);
2424

25-
fuse_write_update_attr(inode, pos, ret);
25+
fuse_write_update_attr(inode, iocb->ki_pos, ret);
2626
}
2727

2828
ssize_t fuse_passthrough_read_iter(struct kiocb *iocb, struct iov_iter *iter)
@@ -34,7 +34,6 @@ ssize_t fuse_passthrough_read_iter(struct kiocb *iocb, struct iov_iter *iter)
3434
ssize_t ret;
3535
struct backing_file_ctx ctx = {
3636
.cred = ff->cred,
37-
.user_file = file,
3837
.accessed = fuse_file_accessed,
3938
};
4039

@@ -62,7 +61,6 @@ ssize_t fuse_passthrough_write_iter(struct kiocb *iocb,
6261
ssize_t ret;
6362
struct backing_file_ctx ctx = {
6463
.cred = ff->cred,
65-
.user_file = file,
6664
.end_write = fuse_passthrough_end_write,
6765
};
6866

@@ -88,15 +86,20 @@ ssize_t fuse_passthrough_splice_read(struct file *in, loff_t *ppos,
8886
struct file *backing_file = fuse_file_passthrough(ff);
8987
struct backing_file_ctx ctx = {
9088
.cred = ff->cred,
91-
.user_file = in,
9289
.accessed = fuse_file_accessed,
9390
};
91+
struct kiocb iocb;
92+
ssize_t ret;
9493

9594
pr_debug("%s: backing_file=0x%p, pos=%lld, len=%zu, flags=0x%x\n", __func__,
96-
backing_file, ppos ? *ppos : 0, len, flags);
95+
backing_file, *ppos, len, flags);
9796

98-
return backing_file_splice_read(backing_file, ppos, pipe, len, flags,
99-
&ctx);
97+
init_sync_kiocb(&iocb, in);
98+
iocb.ki_pos = *ppos;
99+
ret = backing_file_splice_read(backing_file, &iocb, pipe, len, flags, &ctx);
100+
*ppos = iocb.ki_pos;
101+
102+
return ret;
100103
}
101104

102105
ssize_t fuse_passthrough_splice_write(struct pipe_inode_info *pipe,
@@ -109,16 +112,18 @@ ssize_t fuse_passthrough_splice_write(struct pipe_inode_info *pipe,
109112
ssize_t ret;
110113
struct backing_file_ctx ctx = {
111114
.cred = ff->cred,
112-
.user_file = out,
113115
.end_write = fuse_passthrough_end_write,
114116
};
117+
struct kiocb iocb;
115118

116119
pr_debug("%s: backing_file=0x%p, pos=%lld, len=%zu, flags=0x%x\n", __func__,
117-
backing_file, ppos ? *ppos : 0, len, flags);
120+
backing_file, *ppos, len, flags);
118121

119122
inode_lock(inode);
120-
ret = backing_file_splice_write(pipe, backing_file, ppos, len, flags,
121-
&ctx);
123+
init_sync_kiocb(&iocb, out);
124+
iocb.ki_pos = *ppos;
125+
ret = backing_file_splice_write(pipe, backing_file, &iocb, len, flags, &ctx);
126+
*ppos = iocb.ki_pos;
122127
inode_unlock(inode);
123128

124129
return ret;
@@ -130,7 +135,6 @@ ssize_t fuse_passthrough_mmap(struct file *file, struct vm_area_struct *vma)
130135
struct file *backing_file = fuse_file_passthrough(ff);
131136
struct backing_file_ctx ctx = {
132137
.cred = ff->cred,
133-
.user_file = file,
134138
.accessed = fuse_file_accessed,
135139
};
136140

‎fs/overlayfs/file.c‎

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -231,9 +231,9 @@ static void ovl_file_modified(struct file *file)
231231
ovl_copyattr(file_inode(file));
232232
}
233233

234-
static void ovl_file_end_write(struct file *file, loff_t pos, ssize_t ret)
234+
static void ovl_file_end_write(struct kiocb *iocb, ssize_t ret)
235235
{
236-
ovl_file_modified(file);
236+
ovl_file_modified(iocb->ki_filp);
237237
}
238238

239239
static void ovl_file_accessed(struct file *file)
@@ -271,7 +271,6 @@ static ssize_t ovl_read_iter(struct kiocb *iocb, struct iov_iter *iter)
271271
ssize_t ret;
272272
struct backing_file_ctx ctx = {
273273
.cred = ovl_creds(file_inode(file)->i_sb),
274-
.user_file = file,
275274
.accessed = ovl_file_accessed,
276275
};
277276

@@ -298,7 +297,6 @@ static ssize_t ovl_write_iter(struct kiocb *iocb, struct iov_iter *iter)
298297
int ifl = iocb->ki_flags;
299298
struct backing_file_ctx ctx = {
300299
.cred = ovl_creds(inode->i_sb),
301-
.user_file = file,
302300
.end_write = ovl_file_end_write,
303301
};
304302

@@ -338,15 +336,18 @@ static ssize_t ovl_splice_read(struct file *in, loff_t *ppos,
338336
ssize_t ret;
339337
struct backing_file_ctx ctx = {
340338
.cred = ovl_creds(file_inode(in)->i_sb),
341-
.user_file = in,
342339
.accessed = ovl_file_accessed,
343340
};
341+
struct kiocb iocb;
344342

345343
ret = ovl_real_fdget(in, &real);
346344
if (ret)
347345
return ret;
348346

349-
ret = backing_file_splice_read(fd_file(real), ppos, pipe, len, flags, &ctx);
347+
init_sync_kiocb(&iocb, in);
348+
iocb.ki_pos = *ppos;
349+
ret = backing_file_splice_read(fd_file(real), &iocb, pipe, len, flags, &ctx);
350+
*ppos = iocb.ki_pos;
350351
fdput(real);
351352

352353
return ret;
@@ -368,9 +369,9 @@ static ssize_t ovl_splice_write(struct pipe_inode_info *pipe, struct file *out,
368369
ssize_t ret;
369370
struct backing_file_ctx ctx = {
370371
.cred = ovl_creds(inode->i_sb),
371-
.user_file = out,
372372
.end_write = ovl_file_end_write,
373373
};
374+
struct kiocb iocb;
374375

375376
inode_lock(inode);
376377
/* Update mode */
@@ -380,9 +381,13 @@ static ssize_t ovl_splice_write(struct pipe_inode_info *pipe, struct file *out,
380381
if (ret)
381382
goto out_unlock;
382383

383-
ret = backing_file_splice_write(pipe, fd_file(real), ppos, len, flags, &ctx);
384+
init_sync_kiocb(&iocb, out);
385+
iocb.ki_pos = *ppos;
386+
ret = backing_file_splice_write(pipe, fd_file(real), &iocb, len, flags, &ctx);
387+
*ppos = iocb.ki_pos;
384388
fdput(real);
385389

390+
386391
out_unlock:
387392
inode_unlock(inode);
388393

@@ -420,7 +425,6 @@ static int ovl_mmap(struct file *file, struct vm_area_struct *vma)
420425
struct file *realfile = file->private_data;
421426
struct backing_file_ctx ctx = {
422427
.cred = ovl_creds(file_inode(file)->i_sb),
423-
.user_file = file,
424428
.accessed = ovl_file_accessed,
425429
};
426430

‎include/linux/backing-file.h‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,8 @@
1414

1515
struct backing_file_ctx {
1616
const struct cred *cred;
17-
struct file *user_file;
18-
void (*accessed)(struct file *);
19-
void (*end_write)(struct file *, loff_t, ssize_t);
17+
void (*accessed)(struct file *file);
18+
void (*end_write)(struct kiocb *iocb, ssize_t);
2019
};
2120

2221
struct file *backing_file_open(const struct path *user_path, int flags,
@@ -31,13 +30,13 @@ ssize_t backing_file_read_iter(struct file *file, struct iov_iter *iter,
3130
ssize_t backing_file_write_iter(struct file *file, struct iov_iter *iter,
3231
struct kiocb *iocb, int flags,
3332
struct backing_file_ctx *ctx);
34-
ssize_t backing_file_splice_read(struct file *in, loff_t *ppos,
33+
ssize_t backing_file_splice_read(struct file *in, struct kiocb *iocb,
3534
struct pipe_inode_info *pipe, size_t len,
3635
unsigned int flags,
3736
struct backing_file_ctx *ctx);
3837
ssize_t backing_file_splice_write(struct pipe_inode_info *pipe,
39-
struct file *out, loff_t *ppos, size_t len,
40-
unsigned int flags,
38+
struct file *out, struct kiocb *iocb,
39+
size_t len, unsigned int flags,
4140
struct backing_file_ctx *ctx);
4241
int backing_file_mmap(struct file *file, struct vm_area_struct *vma,
4342
struct backing_file_ctx *ctx);

0 commit comments

Comments
 (0)