<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
<style type="text/css" style="display:none;"> P {margin-top:0;margin-bottom:0;} </style>
</head>
<body dir="ltr">
<div style="font-family: Aptos, Aptos_EmbeddedFont, Aptos_MSFontService, Calibri, Helvetica, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);" class="elementToProof">
changes in v2 </div>
<div style="font-family: Aptos, Aptos_EmbeddedFont, Aptos_MSFontService, Calibri, Helvetica, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);" class="elementToProof">
<br>
</div>
<div style="font-family: Aptos, Aptos_EmbeddedFont, Aptos_MSFontService, Calibri, Helvetica, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);" class="elementToProof">
fix all problems found by AI reviews except </div>
<div style="font-family: Aptos, Aptos_EmbeddedFont, Aptos_MSFontService, Calibri, Helvetica, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);" class="elementToProof">
<br>
</div>
<div style="margin-left: 40px; font-family: Aptos, Aptos_EmbeddedFont, Aptos_MSFontService, Calibri, Helvetica, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);" class="elementToProof">
3. Incorrect nodeid in trace output</div>
<div style="margin-left: 40px; font-family: Aptos, Aptos_EmbeddedFont, Aptos_MSFontService, Calibri, Helvetica, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);" class="elementToProof">
<br>
</div>
<div style="margin-left: 40px; font-family: Aptos, Aptos_EmbeddedFont, Aptos_MSFontService, Calibri, Helvetica, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);" class="elementToProof">
nodeid = get_node_id(&fi->inode) - FUSE_ROOT_ID;</div>
<div style="margin-left: 40px; font-family: Aptos, Aptos_EmbeddedFont, Aptos_MSFontService, Calibri, Helvetica, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);" class="elementToProof">
<br>
</div>
<div style="margin-left: 40px; font-family: Aptos, Aptos_EmbeddedFont, Aptos_MSFontService, Calibri, Helvetica, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);" class="elementToProof">
FUSE_ROOT_ID is 1. This subtracts 1 from every nodeid in trace messages, producing wrong values.</div>
<div style="margin-left: 40px; font-family: Aptos, Aptos_EmbeddedFont, Aptos_MSFontService, Calibri, Helvetica, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);" class="elementToProof">
Should just be</div>
<div style="margin-left: 40px; font-family: Aptos, Aptos_EmbeddedFont, Aptos_MSFontService, Calibri, Helvetica, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);" class="elementToProof">
get_node_id(&fi->inode).</div>
<div style="font-family: Aptos, Aptos_EmbeddedFont, Aptos_MSFontService, Calibri, Helvetica, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);" class="elementToProof">
<br>
</div>
<div style="font-family: Aptos, Aptos_EmbeddedFont, Aptos_MSFontService, Calibri, Helvetica, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);" class="elementToProof">
Using "get_node_id(&fi->inode) - FUSE_ROOT_ID" is intentional to make it align with userspace. </div>
<div style="font-family: Aptos, Aptos_EmbeddedFont, Aptos_MSFontService, Calibri, Helvetica, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);" class="elementToProof">
<br>
</div>
<div id="appendonsend"></div>
<hr style="display:inline-block;width:98%" tabindex="-1">
<div id="divRplyFwdMsg" dir="ltr"><font face="Calibri, sans-serif" style="font-size:11pt" color="#000000"><b>From:</b> Liu Kui <kui.liu@virtuozzo.com><br>
<b>Sent:</b> 25 March 2026 15:12<br>
<b>To:</b> devel@openvz.org <devel@openvz.org><br>
<b>Cc:</b> Alexey Kuznetsov <kuznet@virtuozzo.com>; Andrey Zaitsev <azaitsev@virtuozzo.com>; Konstantin Khorenko <khorenko@virtuozzo.com>; Kui Liu <kui.liu@virtuozzo.com><br>
<b>Subject:</b> [PATCH VZ10 v2] fs/fuse: revamp fuse_invalidate_files() to avoid blocking the userspace evloop</font>
<div> </div>
</div>
<div class="BodyFragment"><font size="2"><span style="font-size:11pt;">
<div class="PlainText">On large files, fuse_invalidate_files() can take a very long time to complete.<br>
This is caused by two slow operations that cannot be optimized:<br>
- filemap_write_and_wait() when the file is under heavy write load, and<br>
- invalidate_inode_pages2() when the page cache is heavily populated.<br>
<br>
These long delays block the userspace evloop (which must not be blocked) and<br>
can trigger a shaman reboot in the worst case.<br>
<br>
To fix this, the following changes are made:<br>
<br>
1. Move the execution of filemap_write_and_wait() and invalidate_inode_pages2()<br>
into a dedicated kernel workqueue item.<br>
<br>
2. In fuse_invalidate_files(), only set the FUSE_I_INVAL_FILES bit in fi->state<br>
and schedule the invalidation work for the fuse_inode.<br>
<br>
3. Block new opens of the file while the FUSE_I_INVAL_FILES bit is set.<br>
The bit is cleared only after the file has been fully invalidated.<br>
This is necessary because userspace views the file as fully invalidated<br>
as soon as fuse_invalidate_files() returns.<br>
<br>
Additionally, make the fuse trace function available in fuse module so<br>
that fuse_invalidate_files events can be traced and logged.<br>
<br>
Related to<br>
<a href="https://virtuozzo.atlassian.net/browse/VSTOR-124254">https://virtuozzo.atlassian.net/browse/VSTOR-124254</a><br>
<br>
Signed-off-by: Liu Kui <kui.liu@virtuozzo.com><br>
---<br>
fs/fuse/dev.c | 2 +-<br>
fs/fuse/file.c | 30 ++++++--<br>
fs/fuse/fuse_i.h | 22 +++++-<br>
fs/fuse/inode.c | 114 ++++++++++++++++++++++++-----<br>
fs/fuse/kio/pcs/pcs_fuse_kdirect.c | 32 ++++++--<br>
5 files changed, 165 insertions(+), 35 deletions(-)<br>
<br>
diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c<br>
index c1102069d032..4fcfd644dcf6 100644<br>
--- a/fs/fuse/dev.c<br>
+++ b/fs/fuse/dev.c<br>
@@ -110,7 +110,7 @@ static bool fuse_block_alloc(struct fuse_conn *fc, bool for_background)<br>
return !fc->initialized || (for_background && fc->blocked);<br>
}<br>
<br>
-static void fuse_drop_waiting(struct fuse_conn *fc)<br>
+void fuse_drop_waiting(struct fuse_conn *fc)<br>
{<br>
/*<br>
* lockess check of fc->connected is okay, because atomic_dec_and_test()<br>
diff --git a/fs/fuse/file.c b/fs/fuse/file.c<br>
index 0860996c19ad..7bebe03dda5b 100644<br>
--- a/fs/fuse/file.c<br>
+++ b/fs/fuse/file.c<br>
@@ -252,10 +252,11 @@ static void fuse_link_rw_file(struct file *file)<br>
struct fuse_file *ff = file->private_data;<br>
<br>
spin_lock(&fi->lock);<br>
- if (test_bit(FUSE_I_INVAL_FILES, &fi->state)) {<br>
+ if (unlikely(test_bit(FUSE_I_INVAL_FILES, &fi->state))) {<br>
spin_lock(&ff->lock);<br>
set_bit(FUSE_S_FAIL_IMMEDIATELY, &ff->ff_state);<br>
spin_unlock(&ff->lock);<br>
+ fuse_ktrace(ff->fm->fc, "fuse_file[%llu] --> invalidate_file on [%llu] pending", ff->fh, ff->nodeid);<br>
}<br>
if (list_empty(&ff->rw_entry))<br>
list_add(&ff->rw_entry, &fi->rw_files);<br>
@@ -319,6 +320,13 @@ static int fuse_open(struct inode *inode, struct file *file)<br>
if ((file->f_flags & O_DIRECT) && !fc->direct_enable)<br>
return -EINVAL;<br>
<br>
+ if (unlikely(test_bit(FUSE_I_INVAL_FILES, &fi->state))) {<br>
+ fuse_ktrace(fc, "waiting for invalidate_file on [%llu] to complete", fi->nodeid);<br>
+ err = wait_on_bit(&fi->state, FUSE_I_INVAL_FILES, TASK_KILLABLE);<br>
+ if (err)<br>
+ return err;<br>
+ }<br>
+<br>
err = generic_file_open(inode, file);<br>
if (err)<br>
return err;<br>
@@ -361,8 +369,6 @@ static int fuse_open(struct inode *inode, struct file *file)<br>
inode_unlock(inode);<br>
<br>
if (!err && fc->close_wait) {<br>
- struct fuse_inode *fi = get_fuse_inode(inode);<br>
-<br>
inode_lock(inode);<br>
spin_lock(&fi->lock);<br>
<br>
@@ -1409,6 +1415,12 @@ static ssize_t fuse_cache_read_iter(struct kiocb *iocb, struct iov_iter *to)<br>
return err;<br>
}<br>
<br>
+ /*<br>
+ * Block read if the file had been invalidated.<br>
+ */<br>
+ if (fuse_file_fail_immediately(iocb->ki_filp->private_data))<br>
+ return -EIO;<br>
+<br>
return generic_file_read_iter(iocb, to);<br>
}<br>
<br>
@@ -1794,6 +1806,12 @@ static ssize_t fuse_cache_write_iter(struct kiocb *iocb, struct iov_iter *from)<br>
goto writethrough;<br>
}<br>
<br>
+ /*<br>
+ * Block write if the file had been invalidated.<br>
+ */<br>
+ if (fuse_file_fail_immediately(file->private_data))<br>
+ return -EIO;<br>
+<br>
return generic_file_write_iter(iocb, from);<br>
}<br>
<br>
@@ -2704,13 +2722,9 @@ static int fuse_writepages_fill(struct folio *folio,<br>
<br>
BUG_ON(wpa && !data->ff);<br>
<br>
- /* More than optimization: writeback pages to /dev/null; fused would<br>
- * drop our FUSE_WRITE requests anyway, but it will be blocked while<br>
- * sending NOTIFY_INVAL_FILES until we return!<br>
- */<br>
if (!wpa && test_bit(FUSE_I_INVAL_FILES, &fi->state)) {<br>
unlock_page(&folio->page);<br>
- return 0;<br>
+ return -EIO;<br>
}<br>
<br>
if (wpa && fuse_writepage_need_send(fc, &folio->page, ap, data)) {<br>
diff --git a/fs/fuse/fuse_i.h b/fs/fuse/fuse_i.h<br>
index 853bf12e282d..35222f48cb5b 100644<br>
--- a/fs/fuse/fuse_i.h<br>
+++ b/fs/fuse/fuse_i.h<br>
@@ -215,6 +215,9 @@ struct fuse_inode {<br>
atomic_t read_count;<br>
atomic_t write_count;<br>
} dio;<br>
+<br>
+ /** Entry on fc->inval_files_list list */<br>
+ struct list_head inval_files_entry;<br>
};<br>
<br>
/** FUSE inode state bits */<br>
@@ -1110,7 +1113,13 @@ struct fuse_conn {<br>
} kio;<br>
<br>
int ktrace_level;<br>
- struct fuse_ktrace * ktrace;<br>
+ struct fuse_ktrace *ktrace;<br>
+ void (*fuse_ktrace_fn)(struct fuse_conn *fc, const char *fmt, ...);<br>
+<br>
+ /* List of fuse_inodes to be invalidated by userspace */<br>
+ struct list_head inval_files_list;<br>
+ struct delayed_work inval_files_work;<br>
+<br>
struct dentry *conn_ctl;<br>
<br>
/* New writepages go into this bucket */<br>
@@ -1122,6 +1131,14 @@ struct fuse_conn {<br>
#endif<br>
};<br>
<br>
+#define fuse_ktrace(fc, fmt, args...) { \<br>
+ do { \<br>
+ struct fuse_conn *__fc = (fc); \<br>
+ if (__fc->fuse_ktrace_fn) \<br>
+ __fc->fuse_ktrace_fn(__fc, "%s: " fmt, __func__, ## args); \<br>
+ } while (0); \<br>
+}<br>
+<br>
/*<br>
* Represents a mounted filesystem, potentially a submount.<br>
*<br>
@@ -1552,7 +1569,7 @@ static inline void fuse_dio_wait(struct fuse_inode *fi)<br>
<br>
static inline bool fuse_file_fail_immediately(struct fuse_file *ff)<br>
{<br>
- return ff && test_bit(FUSE_S_FAIL_IMMEDIATELY, &ff->ff_state);<br>
+ return unlikely(ff && test_bit(FUSE_S_FAIL_IMMEDIATELY, &ff->ff_state));<br>
}<br>
<br>
/**<br>
@@ -1717,6 +1734,7 @@ void fuse_file_release(struct inode *inode, struct fuse_file *ff,<br>
<br>
struct fuse_kio_ops *fuse_kio_get(struct fuse_conn *fc, char *name);<br>
void fuse_kio_put(struct fuse_kio_ops *ops);<br>
+void fuse_drop_waiting(struct fuse_conn *fc);<br>
<br>
/* passthrough.c */<br>
static inline struct fuse_backing *fuse_inode_backing(struct fuse_inode *fi)<br>
diff --git a/fs/fuse/inode.c b/fs/fuse/inode.c<br>
index f167d275885b..2e6cf9edb04e 100644<br>
--- a/fs/fuse/inode.c<br>
+++ b/fs/fuse/inode.c<br>
@@ -35,6 +35,8 @@ struct list_head fuse_conn_list;<br>
DEFINE_MUTEX(fuse_mutex);<br>
EXPORT_SYMBOL_GPL(fuse_mutex);<br>
<br>
+struct workqueue_struct *fuse_inval_files_wq;<br>
+<br>
static int fuse_ve_odirect;<br>
<br>
static int set_global_limit(const char *val, const struct kernel_param *kp);<br>
@@ -117,6 +119,7 @@ static struct inode *fuse_alloc_inode(struct super_block *sb)<br>
fi->i_size_unstable = 0;<br>
fi->private = NULL;<br>
INIT_LIST_HEAD(&fi->rw_files);<br>
+ INIT_LIST_HEAD(&fi->inval_files_entry);<br>
mutex_init(&fi->mutex);<br>
spin_lock_init(&fi->lock);<br>
init_waitqueue_head(&fi->dio.waitq);<br>
@@ -603,12 +606,81 @@ void fuse_unlock_inode(struct inode *inode, bool locked)<br>
mutex_unlock(&get_fuse_inode(inode)->mutex);<br>
}<br>
<br>
+static void fuse_inval_files_work(struct work_struct *w)<br>
+{<br>
+ struct fuse_conn *fc = container_of(w, struct fuse_conn, inval_files_work.work);<br>
+ struct list_head inval_files_list;<br>
+ struct list_head failed_list;<br>
+ struct fuse_file *ff;<br>
+ struct fuse_inode *fi;<br>
+ bool to_retry;<br>
+ int err;<br>
+<br>
+ INIT_LIST_HEAD(&inval_files_list);<br>
+ INIT_LIST_HEAD(&failed_list);<br>
+<br>
+ spin_lock(&fc->lock);<br>
+ list_splice_init(&fc->inval_files_list, &inval_files_list);<br>
+ to_retry = fc->connected;<br>
+ spin_unlock(&fc->lock);<br>
+<br>
+ while (!list_empty(&inval_files_list)) {<br>
+ u64 nodeid;<br>
+<br>
+ fi = list_first_entry(&inval_files_list, struct fuse_inode, inval_files_entry);<br>
+ list_del(&fi->inval_files_entry);<br>
+ nodeid = get_node_id(&fi->inode) - FUSE_ROOT_ID;<br>
+ fuse_ktrace(fc, "invalidate_file on [%llu] starts", nodeid);<br>
+<br>
+ err = filemap_write_and_wait(fi->inode.i_mapping);<br>
+ if (err && err != -EIO && to_retry) {<br>
+ fuse_ktrace(fc, "filemap_write_and_wait() on [%llu] returns err=%d", nodeid, err);<br>
+ list_add_tail(&fi->inval_files_entry, &failed_list);<br>
+ continue;<br>
+ }<br>
+<br>
+ spin_lock(&fi->lock);<br>
+ list_for_each_entry(ff, &fi->rw_files, rw_entry)<br>
+ fuse_revoke_readpages(ff);<br>
+ spin_unlock(&fi->lock);<br>
+<br>
+ wake_up(&fi->page_waitq); /* readpage[s] can wait on fuse wb */<br>
+<br>
+ err = invalidate_inode_pages2(fi->inode.i_mapping);<br>
+ if (err && to_retry) {<br>
+ fuse_ktrace(fc, "invalidate_inode_pages2() on [%llu] returns err=%d", nodeid, err);<br>
+ list_add_tail(&fi->inval_files_entry, &failed_list);<br>
+ continue;<br>
+ }<br>
+<br>
+ fuse_invalidate_attr(&fi->inode);<br>
+<br>
+ spin_lock(&fi->lock);<br>
+ clear_bit(FUSE_I_INVAL_FILES, &fi->state);<br>
+ wake_up_bit(&fi->state, FUSE_I_INVAL_FILES);<br>
+ spin_unlock(&fi->lock);<br>
+<br>
+ fuse_ktrace(fc, "invalidate_file on [%llu] ends", nodeid);<br>
+ iput(&fi->inode);<br>
+ }<br>
+<br>
+ if (!list_empty(&failed_list)) {<br>
+ spin_lock(&fc->lock);<br>
+ list_splice_init(&failed_list, &fc->inval_files_list);<br>
+ spin_unlock(&fc->lock);<br>
+ if (queue_delayed_work(fuse_inval_files_wq, &fc->inval_files_work, 1))<br>
+ return;<br>
+ }<br>
+<br>
+ fuse_drop_waiting(fc);<br>
+}<br>
+<br>
int fuse_invalidate_files(struct fuse_conn *fc, u64 nodeid)<br>
{<br>
struct inode *inode;<br>
struct fuse_inode *fi;<br>
struct fuse_file *ff;<br>
- int err, i;<br>
+ int i;<br>
<br>
if (!fc->async_read) {<br>
printk(KERN_ERR "Turn async_read ON to use "<br>
@@ -624,6 +696,11 @@ int fuse_invalidate_files(struct fuse_conn *fc, u64 nodeid)<br>
<br>
/* Mark that invalidate files is in progress */<br>
spin_lock(&fi->lock);<br>
+ if (test_bit(FUSE_I_INVAL_FILES, &fi->state)) {<br>
+ spin_unlock(&fi->lock);<br>
+ iput(inode);<br>
+ return 0;<br>
+ }<br>
set_bit(FUSE_I_INVAL_FILES, &fi->state);<br>
list_for_each_entry(ff, &fi->rw_files, rw_entry) {<br>
spin_lock(&ff->lock);<br>
@@ -638,23 +715,14 @@ int fuse_invalidate_files(struct fuse_conn *fc, u64 nodeid)<br>
for (i = 0; i < FUSE_QHASH_SIZE; i++)<br>
wake_up_all(&fc->qhash[i].waitq);<br>
<br>
- err = filemap_write_and_wait(inode->i_mapping);<br>
- if (!err || err == -EIO) { /* AS_EIO might trigger -EIO */<br>
- spin_lock(&fi->lock);<br>
- list_for_each_entry(ff, &fi->rw_files, rw_entry)<br>
- fuse_revoke_readpages(ff);<br>
- spin_unlock(&fi->lock);<br>
-<br>
- wake_up(&fi->page_waitq); /* readpage[s] can wait on fuse wb */<br>
- err = invalidate_inode_pages2(inode->i_mapping);<br>
- }<br>
-<br>
- if (!err)<br>
- fuse_invalidate_attr(inode);<br>
+ atomic_inc(&fc->num_waiting);<br>
+ spin_lock(&fc->lock);<br>
+ list_add_tail(&fi->inval_files_entry, &fc->inval_files_list);<br>
+ spin_unlock(&fc->lock);<br>
+ if (!queue_delayed_work(fuse_inval_files_wq, &fc->inval_files_work, 0))<br>
+ fuse_drop_waiting(fc);<br>
<br>
- clear_bit(FUSE_I_INVAL_FILES, &fi->state);<br>
- iput(inode);<br>
- return err;<br>
+ return 0;<br>
}<br>
<br>
static void fuse_umount_begin(struct super_block *sb)<br>
@@ -1308,6 +1376,9 @@ int fuse_conn_init(struct fuse_conn *fc, struct fuse_mount *fm,<br>
if (IS_ENABLED(CONFIG_FUSE_PASSTHROUGH))<br>
fuse_backing_files_init(fc);<br>
<br>
+ INIT_LIST_HEAD(&fc->inval_files_list);<br>
+ INIT_DELAYED_WORK(&fc->inval_files_work, fuse_inval_files_work);<br>
+<br>
INIT_LIST_HEAD(&fc->mounts);<br>
list_add(&fm->fc_entry, &fc->mounts);<br>
fm->fc = fc;<br>
@@ -2456,13 +2527,17 @@ static int __init fuse_fs_init(void)<br>
{<br>
int err;<br>
<br>
+ fuse_inval_files_wq = alloc_workqueue("fuse_inval_files_wq", WQ_MEM_RECLAIM, 1);<br>
+ if (!fuse_inval_files_wq)<br>
+ goto out;<br>
+<br>
fuse_inode_cachep = kmem_cache_create("fuse_inode",<br>
sizeof(struct fuse_inode), 0,<br>
SLAB_HWCACHE_ALIGN|SLAB_ACCOUNT|SLAB_RECLAIM_ACCOUNT,<br>
fuse_inode_init_once);<br>
err = -ENOMEM;<br>
if (!fuse_inode_cachep)<br>
- goto out;<br>
+ goto out1;<br>
<br>
err = register_fuseblk();<br>
if (err)<br>
@@ -2478,6 +2553,8 @@ static int __init fuse_fs_init(void)<br>
unregister_fuseblk();<br>
out2:<br>
kmem_cache_destroy(fuse_inode_cachep);<br>
+ out1:<br>
+ destroy_workqueue(fuse_inval_files_wq);<br>
out:<br>
return err;<br>
}<br>
@@ -2493,6 +2570,7 @@ static void fuse_fs_cleanup(void)<br>
*/<br>
rcu_barrier();<br>
kmem_cache_destroy(fuse_inode_cachep);<br>
+ destroy_workqueue(fuse_inval_files_wq);<br>
}<br>
<br>
static struct kobject *fuse_kobj;<br>
diff --git a/fs/fuse/kio/pcs/pcs_fuse_kdirect.c b/fs/fuse/kio/pcs/pcs_fuse_kdirect.c<br>
index eafe2ee2313b..42cdca250cd9 100644<br>
--- a/fs/fuse/kio/pcs/pcs_fuse_kdirect.c<br>
+++ b/fs/fuse/kio/pcs/pcs_fuse_kdirect.c<br>
@@ -158,6 +158,7 @@ MODULE_PARM_DESC(rdmaio_io_failing, "Enable/Disbale RDMA io failing");<br>
<br>
static int fuse_ktrace_setup(struct fuse_conn * fc);<br>
static int fuse_ktrace_remove(struct fuse_conn *fc);<br>
+static void kfuse_trace(struct fuse_conn *fc, const char *fmt, ...);<br>
<br>
static struct kmem_cache *pcs_fuse_req_cachep;<br>
static struct kmem_cache *pcs_ireq_cachep;<br>
@@ -1672,6 +1673,8 @@ static int fuse_ktrace_setup(struct fuse_conn * fc)<br>
goto err;<br>
}<br>
<br>
+ fc->fuse_ktrace_fn = kfuse_trace;<br>
+<br>
return 0;<br>
<br>
err:<br>
@@ -1680,22 +1683,19 @@ static int fuse_ktrace_setup(struct fuse_conn * fc)<br>
return ret;<br>
}<br>
<br>
-void __kfuse_trace(struct fuse_conn * fc, unsigned long ip, const char * fmt, ...)<br>
+static void kfuse_tracer(struct fuse_conn *fc, unsigned long ip, const char *fmt, va_list va)<br>
{<br>
- struct fuse_ktrace * tr;<br>
- va_list va;<br>
+ struct fuse_ktrace *tr;<br>
int cpu;<br>
<br>
cpu = get_cpu();<br>
tr = fc->ktrace;<br>
if (tr) {<br>
u8 * buf = per_cpu_ptr(tr->buf, cpu);<br>
- struct fuse_trace_hdr * t;<br>
+ struct fuse_trace_hdr *t;<br>
int len;<br>
<br>
- va_start(va, fmt);<br>
len = vsnprintf(buf, KTRACE_LOG_BUF_SIZE, fmt, va);<br>
- va_end(va);<br>
t = fuse_trace_prepare(tr, FUSE_KTRACE_STRING, len + 1);<br>
if (t)<br>
memcpy(t + 1, buf, len + 1);<br>
@@ -1710,6 +1710,26 @@ void __kfuse_trace(struct fuse_conn * fc, unsigned long ip, const char * fmt, ..<br>
put_cpu();<br>
}<br>
<br>
+void __kfuse_trace(struct fuse_conn *fc, unsigned long ip, const char *fmt, ...)<br>
+{<br>
+ va_list va;<br>
+<br>
+ va_start(va, fmt);<br>
+ kfuse_tracer(fc, ip, fmt, va);<br>
+ va_end(va);<br>
+}<br>
+<br>
+static void kfuse_trace(struct fuse_conn *fc, const char *fmt, ...)<br>
+{<br>
+ va_list va;<br>
+<br>
+ if (fc->ktrace_level >= LOG_TRACE) {<br>
+ va_start(va, fmt);<br>
+ kfuse_tracer(fc, 0, fmt, va);<br>
+ va_end(va);<br>
+ }<br>
+}<br>
+<br>
void pcs_kio_file_list(struct fuse_conn *fc, kio_file_itr kfile_cb, void *ctx)<br>
{<br>
struct fuse_file *ff;<br>
-- <br>
2.39.5 (Apple Git-154)<br>
<br>
</div>
</span></font></div>
</body>
</html>