Skip to content

Commit cb40359

Browse files
Darrick J. WongMiklos Szeredi
authored andcommitted
fuse: move CREATE_TRACE_POINTS to a separate file
Before we start adding new tracepoints for fuse+iomap, move the tracepoint creation itself to a separate source file so that we don't have to start pulling iomap dependencies into dev.c just for the iomap structures. Signed-off-by: Darrick J. Wong <djwong@kernel.org> Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
1 parent c4331e1 commit cb40359

3 files changed

Lines changed: 15 additions & 2 deletions

File tree

fs/fuse/Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@ obj-$(CONFIG_FUSE_FS) += fuse.o
1010
obj-$(CONFIG_CUSE) += cuse.o
1111
obj-$(CONFIG_VIRTIO_FS) += virtiofs.o
1212

13-
fuse-y := dev.o dir.o file.o inode.o control.o xattr.o acl.o readdir.o ioctl.o
13+
fuse-y := trace.o # put trace.o first so we see ftrace errors sooner
14+
fuse-y += dev.o dir.o file.o inode.o control.o xattr.o acl.o readdir.o ioctl.o
1415
fuse-y += iomode.o
1516
fuse-$(CONFIG_FUSE_DAX) += dax.o
1617
fuse-$(CONFIG_FUSE_PASSTHROUGH) += passthrough.o backing.o

fs/fuse/dev.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
#include <linux/sched.h>
2626
#include <linux/seq_file.h>
2727

28-
#define CREATE_TRACE_POINTS
2928
#include "fuse_trace.h"
3029

3130
MODULE_ALIAS_MISCDEV(FUSE_MINOR);

fs/fuse/trace.c

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
// SPDX-License-Identifier: GPL-2.0
2+
/*
3+
* Copyright (C) 2025 Oracle. All Rights Reserved.
4+
* Author: Darrick J. Wong <djwong@kernel.org>
5+
*/
6+
#include "dev_uring_i.h"
7+
#include "fuse_i.h"
8+
#include "fuse_dev_i.h"
9+
10+
#include <linux/pagemap.h>
11+
12+
#define CREATE_TRACE_POINTS
13+
#include "fuse_trace.h"

0 commit comments

Comments
 (0)