Skip to content

Commit 0c67938

Browse files
mihalicynMiklos Szeredi
mihalicyn
authored and
Miklos Szeredi
committed
fs/fuse: introduce and use fuse_simple_idmap_request() helper
Let's convert all existing callers properly. No functional changes intended. Suggested-by: Christian Brauner <brauner@kernel.org> Signed-off-by: Alexander Mikhalitsyn <aleksandr.mikhalitsyn@canonical.com> Reviewed-by: Christian Brauner <brauner@kernel.org> Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
1 parent 3988a60 commit 0c67938

File tree

9 files changed

+60
-46
lines changed

9 files changed

+60
-46
lines changed

‎fs/fuse/dax.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ static int fuse_setup_one_mapping(struct inode *inode, unsigned long start_idx,
207207
args.in_numargs = 1;
208208
args.in_args[0].size = sizeof(inarg);
209209
args.in_args[0].value = &inarg;
210-
err = fuse_simple_request(NULL, fm, &args);
210+
err = fuse_simple_request(fm, &args);
211211
if (err < 0)
212212
return err;
213213
dmap->writable = writable;
@@ -245,7 +245,7 @@ static int fuse_send_removemapping(struct inode *inode,
245245
args.in_args[0].value = inargp;
246246
args.in_args[1].size = inargp->count * sizeof(*remove_one);
247247
args.in_args[1].value = remove_one;
248-
return fuse_simple_request(NULL, fm, &args);
248+
return fuse_simple_request(fm, &args);
249249
}
250250

251251
static int dmap_removemapping_list(struct inode *inode, unsigned int num,

‎fs/fuse/dev.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -539,9 +539,9 @@ static void fuse_args_to_req(struct fuse_req *req, struct fuse_args *args)
539539
__set_bit(FR_ASYNC, &req->flags);
540540
}
541541

542-
ssize_t fuse_simple_request(struct mnt_idmap *idmap,
543-
struct fuse_mount *fm,
544-
struct fuse_args *args)
542+
ssize_t __fuse_simple_request(struct mnt_idmap *idmap,
543+
struct fuse_mount *fm,
544+
struct fuse_args *args)
545545
{
546546
struct fuse_conn *fc = fm->fc;
547547
struct fuse_req *req;

‎fs/fuse/dir.c

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ static int fuse_dentry_revalidate(struct dentry *entry, unsigned int flags)
230230
parent = dget_parent(entry);
231231
fuse_lookup_init(fm->fc, &args, get_node_id(d_inode(parent)),
232232
&entry->d_name, &outarg);
233-
ret = fuse_simple_request(NULL, fm, &args);
233+
ret = fuse_simple_request(fm, &args);
234234
dput(parent);
235235
/* Zero nodeid is same as -ENOENT */
236236
if (!ret && !outarg.nodeid)
@@ -383,7 +383,7 @@ int fuse_lookup_name(struct super_block *sb, u64 nodeid, const struct qstr *name
383383
attr_version = fuse_get_attr_version(fm->fc);
384384

385385
fuse_lookup_init(fm->fc, &args, nodeid, name, outarg);
386-
err = fuse_simple_request(NULL, fm, &args);
386+
err = fuse_simple_request(fm, &args);
387387
/* Zero nodeid is same as -ENOENT, but with valid timeout */
388388
if (err || !outarg->nodeid)
389389
goto out_put_forget;
@@ -677,7 +677,7 @@ static int fuse_create_open(struct mnt_idmap *idmap, struct inode *dir,
677677
if (err)
678678
goto out_free_ff;
679679

680-
err = fuse_simple_request(idmap, fm, &args);
680+
err = fuse_simple_idmap_request(idmap, fm, &args);
681681
free_ext_value(&args);
682682
if (err)
683683
goto out_free_ff;
@@ -809,7 +809,7 @@ static int create_new_entry(struct mnt_idmap *idmap, struct fuse_mount *fm,
809809
goto out_put_forget_req;
810810
}
811811

812-
err = fuse_simple_request(idmap, fm, args);
812+
err = fuse_simple_idmap_request(idmap, fm, args);
813813
free_ext_value(args);
814814
if (err)
815815
goto out_put_forget_req;
@@ -994,7 +994,7 @@ static int fuse_unlink(struct inode *dir, struct dentry *entry)
994994
args.in_numargs = 1;
995995
args.in_args[0].size = entry->d_name.len + 1;
996996
args.in_args[0].value = entry->d_name.name;
997-
err = fuse_simple_request(NULL, fm, &args);
997+
err = fuse_simple_request(fm, &args);
998998
if (!err) {
999999
fuse_dir_changed(dir);
10001000
fuse_entry_unlinked(entry);
@@ -1017,7 +1017,7 @@ static int fuse_rmdir(struct inode *dir, struct dentry *entry)
10171017
args.in_numargs = 1;
10181018
args.in_args[0].size = entry->d_name.len + 1;
10191019
args.in_args[0].value = entry->d_name.name;
1020-
err = fuse_simple_request(NULL, fm, &args);
1020+
err = fuse_simple_request(fm, &args);
10211021
if (!err) {
10221022
fuse_dir_changed(dir);
10231023
fuse_entry_unlinked(entry);
@@ -1047,7 +1047,7 @@ static int fuse_rename_common(struct mnt_idmap *idmap, struct inode *olddir, str
10471047
args.in_args[1].value = oldent->d_name.name;
10481048
args.in_args[2].size = newent->d_name.len + 1;
10491049
args.in_args[2].value = newent->d_name.name;
1050-
err = fuse_simple_request(idmap, fm, &args);
1050+
err = fuse_simple_idmap_request(idmap, fm, &args);
10511051
if (!err) {
10521052
/* ctime changes */
10531053
fuse_update_ctime(d_inode(oldent));
@@ -1222,7 +1222,7 @@ static int fuse_do_statx(struct mnt_idmap *idmap, struct inode *inode,
12221222
args.out_numargs = 1;
12231223
args.out_args[0].size = sizeof(outarg);
12241224
args.out_args[0].value = &outarg;
1225-
err = fuse_simple_request(NULL, fm, &args);
1225+
err = fuse_simple_request(fm, &args);
12261226
if (err)
12271227
return err;
12281228

@@ -1280,7 +1280,7 @@ static int fuse_do_getattr(struct mnt_idmap *idmap, struct inode *inode,
12801280
args.out_numargs = 1;
12811281
args.out_args[0].size = sizeof(outarg);
12821282
args.out_args[0].value = &outarg;
1283-
err = fuse_simple_request(NULL, fm, &args);
1283+
err = fuse_simple_request(fm, &args);
12841284
if (!err) {
12851285
if (fuse_invalid_attr(&outarg.attr) ||
12861286
inode_wrong_type(inode, outarg.attr.mode)) {
@@ -1492,7 +1492,7 @@ static int fuse_access(struct inode *inode, int mask)
14921492
args.in_numargs = 1;
14931493
args.in_args[0].size = sizeof(inarg);
14941494
args.in_args[0].value = &inarg;
1495-
err = fuse_simple_request(NULL, fm, &args);
1495+
err = fuse_simple_request(fm, &args);
14961496
if (err == -ENOSYS) {
14971497
fm->fc->no_access = 1;
14981498
err = 0;
@@ -1604,7 +1604,7 @@ static int fuse_readlink_page(struct inode *inode, struct page *page)
16041604
ap.args.page_zeroing = true;
16051605
ap.args.out_numargs = 1;
16061606
ap.args.out_args[0].size = desc.length;
1607-
res = fuse_simple_request(NULL, fm, &ap.args);
1607+
res = fuse_simple_request(fm, &ap.args);
16081608

16091609
fuse_invalidate_atime(inode);
16101610

@@ -1889,7 +1889,7 @@ int fuse_flush_times(struct inode *inode, struct fuse_file *ff)
18891889
}
18901890
fuse_setattr_fill(fm->fc, &args, inode, &inarg, &outarg);
18911891

1892-
return fuse_simple_request(NULL, fm, &args);
1892+
return fuse_simple_request(fm, &args);
18931893
}
18941894

18951895
/*
@@ -2002,7 +2002,7 @@ int fuse_do_setattr(struct mnt_idmap *idmap, struct dentry *dentry,
20022002
inarg.valid |= FATTR_KILL_SUIDGID;
20032003
}
20042004
fuse_setattr_fill(fc, &args, inode, &inarg, &outarg);
2005-
err = fuse_simple_request(NULL, fm, &args);
2005+
err = fuse_simple_request(fm, &args);
20062006
if (err) {
20072007
if (err == -EINTR)
20082008
fuse_invalidate_attr(inode);

‎fs/fuse/file.c

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ static int fuse_send_open(struct fuse_mount *fm, u64 nodeid,
4848
args.out_args[0].size = sizeof(*outargp);
4949
args.out_args[0].value = outargp;
5050

51-
return fuse_simple_request(NULL, fm, &args);
51+
return fuse_simple_request(fm, &args);
5252
}
5353

5454
struct fuse_file *fuse_file_alloc(struct fuse_mount *fm, bool release)
@@ -111,7 +111,7 @@ static void fuse_file_put(struct fuse_file *ff, bool sync)
111111
if (!args) {
112112
/* Do nothing when server does not implement 'open' */
113113
} else if (sync) {
114-
fuse_simple_request(NULL, ff->fm, args);
114+
fuse_simple_request(ff->fm, args);
115115
fuse_release_end(ff->fm, args, 0);
116116
} else {
117117
args->end = fuse_release_end;
@@ -539,7 +539,7 @@ static int fuse_flush(struct file *file, fl_owner_t id)
539539
args.in_args[0].value = &inarg;
540540
args.force = true;
541541

542-
err = fuse_simple_request(NULL, fm, &args);
542+
err = fuse_simple_request(fm, &args);
543543
if (err == -ENOSYS) {
544544
fm->fc->no_flush = 1;
545545
err = 0;
@@ -572,7 +572,7 @@ int fuse_fsync_common(struct file *file, loff_t start, loff_t end,
572572
args.in_numargs = 1;
573573
args.in_args[0].size = sizeof(inarg);
574574
args.in_args[0].value = &inarg;
575-
return fuse_simple_request(NULL, fm, &args);
575+
return fuse_simple_request(fm, &args);
576576
}
577577

578578
static int fuse_fsync(struct file *file, loff_t start, loff_t end,
@@ -814,7 +814,7 @@ static ssize_t fuse_send_read(struct fuse_io_args *ia, loff_t pos, size_t count,
814814
if (ia->io->async)
815815
return fuse_async_req_send(fm, ia, count);
816816

817-
return fuse_simple_request(NULL, fm, &ia->ap.args);
817+
return fuse_simple_request(fm, &ia->ap.args);
818818
}
819819

820820
static void fuse_read_update_size(struct inode *inode, loff_t size,
@@ -878,7 +878,7 @@ static int fuse_do_readpage(struct file *file, struct page *page)
878878
desc.length--;
879879

880880
fuse_read_args_fill(&ia, file, pos, desc.length, FUSE_READ);
881-
res = fuse_simple_request(NULL, fm, &ia.ap.args);
881+
res = fuse_simple_request(fm, &ia.ap.args);
882882
if (res < 0)
883883
return res;
884884
/*
@@ -976,7 +976,7 @@ static void fuse_send_readpages(struct fuse_io_args *ia, struct file *file)
976976
if (!err)
977977
return;
978978
} else {
979-
res = fuse_simple_request(NULL, fm, &ap->args);
979+
res = fuse_simple_request(fm, &ap->args);
980980
err = res < 0 ? res : 0;
981981
}
982982
fuse_readpages_end(fm, &ap->args, err);
@@ -1101,7 +1101,7 @@ static ssize_t fuse_send_write(struct fuse_io_args *ia, loff_t pos,
11011101
if (ia->io->async)
11021102
return fuse_async_req_send(fm, ia, count);
11031103

1104-
err = fuse_simple_request(NULL, fm, &ia->ap.args);
1104+
err = fuse_simple_request(fm, &ia->ap.args);
11051105
if (!err && ia->write.out.size > count)
11061106
err = -EIO;
11071107

@@ -1147,7 +1147,7 @@ static ssize_t fuse_send_write_pages(struct fuse_io_args *ia,
11471147
if (fm->fc->handle_killpriv_v2 && !capable(CAP_FSETID))
11481148
ia->write.in.write_flags |= FUSE_WRITE_KILL_SUIDGID;
11491149

1150-
err = fuse_simple_request(NULL, fm, &ap->args);
1150+
err = fuse_simple_request(fm, &ap->args);
11511151
if (!err && ia->write.out.size > count)
11521152
err = -EIO;
11531153

@@ -2662,7 +2662,7 @@ static int fuse_getlk(struct file *file, struct file_lock *fl)
26622662
args.out_numargs = 1;
26632663
args.out_args[0].size = sizeof(outarg);
26642664
args.out_args[0].value = &outarg;
2665-
err = fuse_simple_request(NULL, fm, &args);
2665+
err = fuse_simple_request(fm, &args);
26662666
if (!err)
26672667
err = convert_fuse_file_lock(fm->fc, &outarg.lk, fl);
26682668

@@ -2686,7 +2686,7 @@ static int fuse_setlk(struct file *file, struct file_lock *fl, int flock)
26862686
}
26872687

26882688
fuse_lk_fill(&args, file, fl, opcode, pid_nr, flock, &inarg);
2689-
err = fuse_simple_request(NULL, fm, &args);
2689+
err = fuse_simple_request(fm, &args);
26902690

26912691
/* locking is restartable */
26922692
if (err == -EINTR)
@@ -2760,7 +2760,7 @@ static sector_t fuse_bmap(struct address_space *mapping, sector_t block)
27602760
args.out_numargs = 1;
27612761
args.out_args[0].size = sizeof(outarg);
27622762
args.out_args[0].value = &outarg;
2763-
err = fuse_simple_request(NULL, fm, &args);
2763+
err = fuse_simple_request(fm, &args);
27642764
if (err == -ENOSYS)
27652765
fm->fc->no_bmap = 1;
27662766

@@ -2792,7 +2792,7 @@ static loff_t fuse_lseek(struct file *file, loff_t offset, int whence)
27922792
args.out_numargs = 1;
27932793
args.out_args[0].size = sizeof(outarg);
27942794
args.out_args[0].value = &outarg;
2795-
err = fuse_simple_request(NULL, fm, &args);
2795+
err = fuse_simple_request(fm, &args);
27962796
if (err) {
27972797
if (err == -ENOSYS) {
27982798
fm->fc->no_lseek = 1;
@@ -2925,7 +2925,7 @@ __poll_t fuse_file_poll(struct file *file, poll_table *wait)
29252925
args.out_numargs = 1;
29262926
args.out_args[0].size = sizeof(outarg);
29272927
args.out_args[0].value = &outarg;
2928-
err = fuse_simple_request(NULL, fm, &args);
2928+
err = fuse_simple_request(fm, &args);
29292929

29302930
if (!err)
29312931
return demangle_poll(outarg.revents);
@@ -3147,7 +3147,7 @@ static long fuse_file_fallocate(struct file *file, int mode, loff_t offset,
31473147
args.in_numargs = 1;
31483148
args.in_args[0].size = sizeof(inarg);
31493149
args.in_args[0].value = &inarg;
3150-
err = fuse_simple_request(NULL, fm, &args);
3150+
err = fuse_simple_request(fm, &args);
31513151
if (err == -ENOSYS) {
31523152
fm->fc->no_fallocate = 1;
31533153
err = -EOPNOTSUPP;
@@ -3259,7 +3259,7 @@ static ssize_t __fuse_copy_file_range(struct file *file_in, loff_t pos_in,
32593259
args.out_numargs = 1;
32603260
args.out_args[0].size = sizeof(outarg);
32613261
args.out_args[0].value = &outarg;
3262-
err = fuse_simple_request(NULL, fm, &args);
3262+
err = fuse_simple_request(fm, &args);
32633263
if (err == -ENOSYS) {
32643264
fc->no_copy_file_range = 1;
32653265
err = -EOPNOTSUPP;

‎fs/fuse/fuse_i.h

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1147,8 +1147,22 @@ void __exit fuse_ctl_cleanup(void);
11471147
/**
11481148
* Simple request sending that does request allocation and freeing
11491149
*/
1150-
ssize_t fuse_simple_request(struct mnt_idmap *idmap, struct fuse_mount *fm,
1151-
struct fuse_args *args);
1150+
ssize_t __fuse_simple_request(struct mnt_idmap *idmap,
1151+
struct fuse_mount *fm,
1152+
struct fuse_args *args);
1153+
1154+
static inline ssize_t fuse_simple_request(struct fuse_mount *fm, struct fuse_args *args)
1155+
{
1156+
return __fuse_simple_request(NULL, fm, args);
1157+
}
1158+
1159+
static inline ssize_t fuse_simple_idmap_request(struct mnt_idmap *idmap,
1160+
struct fuse_mount *fm,
1161+
struct fuse_args *args)
1162+
{
1163+
return __fuse_simple_request(idmap, fm, args);
1164+
}
1165+
11521166
int fuse_simple_background(struct fuse_mount *fm, struct fuse_args *args,
11531167
gfp_t gfp_flags);
11541168

‎fs/fuse/inode.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -586,7 +586,7 @@ static void fuse_send_destroy(struct fuse_mount *fm)
586586
args.opcode = FUSE_DESTROY;
587587
args.force = true;
588588
args.nocreds = true;
589-
fuse_simple_request(NULL, fm, &args);
589+
fuse_simple_request(fm, &args);
590590
}
591591
}
592592

@@ -624,7 +624,7 @@ static int fuse_statfs(struct dentry *dentry, struct kstatfs *buf)
624624
args.out_numargs = 1;
625625
args.out_args[0].size = sizeof(outarg);
626626
args.out_args[0].value = &outarg;
627-
err = fuse_simple_request(NULL, fm, &args);
627+
err = fuse_simple_request(fm, &args);
628628
if (!err)
629629
convert_fuse_statfs(buf, &outarg.st);
630630
return err;
@@ -713,7 +713,7 @@ static int fuse_sync_fs(struct super_block *sb, int wait)
713713
args.nodeid = get_node_id(sb->s_root->d_inode);
714714
args.out_numargs = 0;
715715

716-
err = fuse_simple_request(NULL, fm, &args);
716+
err = fuse_simple_request(fm, &args);
717717
if (err == -ENOSYS) {
718718
fc->sync_fs = 0;
719719
err = 0;

‎fs/fuse/ioctl.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ static ssize_t fuse_send_ioctl(struct fuse_mount *fm, struct fuse_args *args,
1818
args->out_args[0].size = sizeof(*outarg);
1919
args->out_args[0].value = outarg;
2020

21-
ret = fuse_simple_request(NULL, fm, args);
21+
ret = fuse_simple_request(fm, args);
2222

2323
/* Translate ENOSYS, which shouldn't be returned from fs */
2424
if (ret == -ENOSYS)

‎fs/fuse/readdir.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@ static void fuse_force_forget(struct file *file, u64 nodeid)
279279
args.force = true;
280280
args.noreply = true;
281281

282-
fuse_simple_request(NULL, fm, &args);
282+
fuse_simple_request(fm, &args);
283283
/* ignore errors */
284284
}
285285

@@ -358,7 +358,7 @@ static int fuse_readdir_uncached(struct file *file, struct dir_context *ctx)
358358
FUSE_READDIR);
359359
}
360360
locked = fuse_lock_inode(inode);
361-
res = fuse_simple_request(NULL, fm, &ap->args);
361+
res = fuse_simple_request(fm, &ap->args);
362362
fuse_unlock_inode(inode, locked);
363363
if (res >= 0) {
364364
if (!res) {

0 commit comments

Comments
 (0)