summaryrefslogtreecommitdiff
path: root/fs/fuse
diff options
context:
space:
mode:
Diffstat (limited to 'fs/fuse')
-rw-r--r--fs/fuse/backing.c2
-rw-r--r--fs/fuse/cuse.c6
-rw-r--r--fs/fuse/dax.c4
-rw-r--r--fs/fuse/dev.c4
-rw-r--r--fs/fuse/dev_uring.c2
-rw-r--r--fs/fuse/file.c4
-rw-r--r--fs/fuse/inode.c12
-rw-r--r--fs/fuse/virtio_fs.c14
8 files changed, 24 insertions, 24 deletions
diff --git a/fs/fuse/backing.c b/fs/fuse/backing.c
index 45a78ee15e3c..d95dfa48483f 100644
--- a/fs/fuse/backing.c
+++ b/fs/fuse/backing.c
@@ -112,7 +112,7 @@ int fuse_backing_open(struct fuse_conn *fc, struct fuse_backing_map *map)
if (backing_sb->s_stack_depth >= fc->max_stack_depth)
goto out_fput;
- fb = kmalloc_obj(struct fuse_backing, GFP_KERNEL);
+ fb = kmalloc_obj(struct fuse_backing);
res = -ENOMEM;
if (!fb)
goto out_fput;
diff --git a/fs/fuse/cuse.c b/fs/fuse/cuse.c
index 0aace951541b..dfcb98a654d8 100644
--- a/fs/fuse/cuse.c
+++ b/fs/fuse/cuse.c
@@ -362,7 +362,7 @@ static void cuse_process_init_reply(struct fuse_mount *fm,
/* devt determined, create device */
rc = -ENOMEM;
- dev = kzalloc_obj(*dev, GFP_KERNEL);
+ dev = kzalloc_obj(*dev);
if (!dev)
goto err_region;
@@ -443,7 +443,7 @@ static int cuse_send_init(struct cuse_conn *cc)
if (!folio)
goto err;
- ia = kzalloc_obj(*ia, GFP_KERNEL);
+ ia = kzalloc_obj(*ia);
if (!ia)
goto err_free_folio;
@@ -505,7 +505,7 @@ static int cuse_channel_open(struct inode *inode, struct file *file)
int rc;
/* set up cuse_conn */
- cc = kzalloc_obj(*cc, GFP_KERNEL);
+ cc = kzalloc_obj(*cc);
if (!cc)
return -ENOMEM;
diff --git a/fs/fuse/dax.c b/fs/fuse/dax.c
index 7d11eac4f629..f6cf00a8938c 100644
--- a/fs/fuse/dax.c
+++ b/fs/fuse/dax.c
@@ -1219,7 +1219,7 @@ static int fuse_dax_mem_range_init(struct fuse_conn_dax *fcd)
__func__, nr_pages, nr_ranges);
for (i = 0; i < nr_ranges; i++) {
- range = kzalloc_obj(struct fuse_dax_mapping, GFP_KERNEL);
+ range = kzalloc_obj(struct fuse_dax_mapping);
ret = -ENOMEM;
if (!range)
goto out_err;
@@ -1255,7 +1255,7 @@ int fuse_dax_conn_alloc(struct fuse_conn *fc, enum fuse_dax_mode dax_mode,
if (!dax_dev)
return 0;
- fcd = kzalloc_obj(*fcd, GFP_KERNEL);
+ fcd = kzalloc_obj(*fcd);
if (!fcd)
return -ENOMEM;
diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c
index 3ec0fa236da0..0b0241f47170 100644
--- a/fs/fuse/dev.c
+++ b/fs/fuse/dev.c
@@ -1598,7 +1598,7 @@ static ssize_t fuse_dev_splice_read(struct file *in, loff_t *ppos,
if (IS_ERR(fud))
return PTR_ERR(fud);
- bufs = kvmalloc_objs(struct pipe_buffer, pipe->max_usage, GFP_KERNEL);
+ bufs = kvmalloc_objs(struct pipe_buffer, pipe->max_usage);
if (!bufs)
return -ENOMEM;
@@ -2310,7 +2310,7 @@ static ssize_t fuse_dev_splice_write(struct pipe_inode_info *pipe,
tail = pipe->tail;
count = pipe_occupancy(head, tail);
- bufs = kvmalloc_objs(struct pipe_buffer, count, GFP_KERNEL);
+ bufs = kvmalloc_objs(struct pipe_buffer, count);
if (!bufs) {
pipe_unlock(pipe);
return -ENOMEM;
diff --git a/fs/fuse/dev_uring.c b/fs/fuse/dev_uring.c
index 68067eaedda9..3a38b61aac26 100644
--- a/fs/fuse/dev_uring.c
+++ b/fs/fuse/dev_uring.c
@@ -277,7 +277,7 @@ static struct fuse_ring_queue *fuse_uring_create_queue(struct fuse_ring *ring,
queue = kzalloc_obj(*queue, GFP_KERNEL_ACCOUNT);
if (!queue)
return NULL;
- pq = kzalloc_objs(struct list_head, FUSE_PQ_HASH_SIZE, GFP_KERNEL);
+ pq = kzalloc_objs(struct list_head, FUSE_PQ_HASH_SIZE);
if (!pq) {
kfree(queue);
return NULL;
diff --git a/fs/fuse/file.c b/fs/fuse/file.c
index e29aecdab97e..b1bb7153cb78 100644
--- a/fs/fuse/file.c
+++ b/fs/fuse/file.c
@@ -684,7 +684,7 @@ static struct fuse_io_args *fuse_io_alloc(struct fuse_io_priv *io,
{
struct fuse_io_args *ia;
- ia = kzalloc_obj(*ia, GFP_KERNEL);
+ ia = kzalloc_obj(*ia);
if (ia) {
ia->io = io;
ia->ap.folios = fuse_folios_alloc(nfolios, GFP_KERNEL,
@@ -2834,7 +2834,7 @@ fuse_direct_IO(struct kiocb *iocb, struct iov_iter *iter)
if ((iov_iter_rw(iter) == READ) && (offset >= i_size))
return 0;
- io = kmalloc_obj(struct fuse_io_priv, GFP_KERNEL);
+ io = kmalloc_obj(struct fuse_io_priv);
if (!io)
return -ENOMEM;
spin_lock_init(&io->lock);
diff --git a/fs/fuse/inode.c b/fs/fuse/inode.c
index 3db0fe0d764b..e57b8af06be9 100644
--- a/fs/fuse/inode.c
+++ b/fs/fuse/inode.c
@@ -1618,11 +1618,11 @@ struct fuse_dev *fuse_dev_alloc(void)
struct fuse_dev *fud;
struct list_head *pq;
- fud = kzalloc_obj(struct fuse_dev, GFP_KERNEL);
+ fud = kzalloc_obj(struct fuse_dev);
if (!fud)
return NULL;
- pq = kzalloc_objs(struct list_head, FUSE_PQ_HASH_SIZE, GFP_KERNEL);
+ pq = kzalloc_objs(struct list_head, FUSE_PQ_HASH_SIZE);
if (!pq) {
kfree(fud);
return NULL;
@@ -1780,7 +1780,7 @@ static int fuse_get_tree_submount(struct fs_context *fsc)
struct super_block *sb;
int err;
- fm = kzalloc_obj(struct fuse_mount, GFP_KERNEL);
+ fm = kzalloc_obj(struct fuse_mount);
if (!fm)
return -ENOMEM;
@@ -1981,11 +1981,11 @@ static int fuse_get_tree(struct fs_context *fsc)
struct super_block *sb;
int err;
- fc = kmalloc_obj(*fc, GFP_KERNEL);
+ fc = kmalloc_obj(*fc);
if (!fc)
return -ENOMEM;
- fm = kzalloc_obj(*fm, GFP_KERNEL);
+ fm = kzalloc_obj(*fm);
if (!fm) {
kfree(fc);
return -ENOMEM;
@@ -2047,7 +2047,7 @@ static int fuse_init_fs_context(struct fs_context *fsc)
{
struct fuse_fs_context *ctx;
- ctx = kzalloc_obj(struct fuse_fs_context, GFP_KERNEL);
+ ctx = kzalloc_obj(struct fuse_fs_context);
if (!ctx)
return -ENOMEM;
diff --git a/fs/fuse/virtio_fs.c b/fs/fuse/virtio_fs.c
index dc96ee0b952a..057e65b51b99 100644
--- a/fs/fuse/virtio_fs.c
+++ b/fs/fuse/virtio_fs.c
@@ -947,14 +947,14 @@ static int virtio_fs_setup_vqs(struct virtio_device *vdev,
fs->num_request_queues = min_t(unsigned int, fs->num_request_queues,
nr_cpu_ids);
fs->nvqs = VQ_REQUEST + fs->num_request_queues;
- fs->vqs = kzalloc_objs(fs->vqs[VQ_HIPRIO], fs->nvqs, GFP_KERNEL);
+ fs->vqs = kzalloc_objs(fs->vqs[VQ_HIPRIO], fs->nvqs);
if (!fs->vqs)
return -ENOMEM;
- vqs = kmalloc_objs(vqs[VQ_HIPRIO], fs->nvqs, GFP_KERNEL);
+ vqs = kmalloc_objs(vqs[VQ_HIPRIO], fs->nvqs);
fs->mq_map = kcalloc_node(nr_cpu_ids, sizeof(*fs->mq_map), GFP_KERNEL,
dev_to_node(&vdev->dev));
- vqs_info = kzalloc_objs(*vqs_info, fs->nvqs, GFP_KERNEL);
+ vqs_info = kzalloc_objs(*vqs_info, fs->nvqs);
if (!vqs || !vqs_info || !fs->mq_map) {
ret = -ENOMEM;
goto out;
@@ -1120,7 +1120,7 @@ static int virtio_fs_probe(struct virtio_device *vdev)
struct virtio_fs *fs;
int ret;
- fs = kzalloc_obj(*fs, GFP_KERNEL);
+ fs = kzalloc_obj(*fs);
if (!fs)
return -ENOMEM;
kobject_init(&fs->kobj, &virtio_fs_ktype);
@@ -1684,11 +1684,11 @@ static int virtio_fs_get_tree(struct fs_context *fsc)
goto out_err;
err = -ENOMEM;
- fc = kzalloc_obj(struct fuse_conn, GFP_KERNEL);
+ fc = kzalloc_obj(struct fuse_conn);
if (!fc)
goto out_err;
- fm = kzalloc_obj(struct fuse_mount, GFP_KERNEL);
+ fm = kzalloc_obj(struct fuse_mount);
if (!fm)
goto out_err;
@@ -1743,7 +1743,7 @@ static int virtio_fs_init_fs_context(struct fs_context *fsc)
if (fsc->purpose == FS_CONTEXT_FOR_SUBMOUNT)
return fuse_init_fs_context_submount(fsc);
- ctx = kzalloc_obj(struct fuse_fs_context, GFP_KERNEL);
+ ctx = kzalloc_obj(struct fuse_fs_context);
if (!ctx)
return -ENOMEM;
fsc->fs_private = ctx;