From: ChenXiaoSong <chenxiaosong@chenxiaosong.com>
To: linkinjeon@kernel.org, tom@talpey.com, senozhatsky@chromium.org,
chenxiaosong@chenxiaosong.com
Cc: linux-cifs@vger.kernel.org, ChenXiaoSong <chenxiaosong@kylinos.cn>
Subject: [PATCH 08/12] smb/server: save old names for rename notify events
Date: Sat, 26 Sep 2026 09:05:14 +0000 [thread overview]
Message-ID: <20260926090518.78547-9-chenxiaosong@chenxiaosong.com> (raw)
In-Reply-To: <20260926090518.78547-1-chenxiaosong@chenxiaosong.com>
From: ChenXiaoSong <chenxiaosong@kylinos.cn>
Save the old name from FS_MOVED_FROM events for matching with a subsequent
FS_MOVED_TO event. Queue unmatched events as removals after a short delay.
Example:
1. client: smbinfo notify /mnt
2. server: ksmbd.control --debug=notify
3. server: mkdir /export/dir/; touch /export/file
4. server: mv /export/file /export/dir/
server debug log:
[40622.865858] ksmbd: Saved moved from, mask 0x40, name file, cookie 1134
[40622.975906] ksmbd: Queue moved from as removed, name file
Signed-off-by: ChenXiaoSong <chenxiaosong@kylinos.cn>
---
fs/smb/server/notify.c | 76 ++++++++++++++++++++++++++++++++++++++++++
1 file changed, 76 insertions(+)
diff --git a/fs/smb/server/notify.c b/fs/smb/server/notify.c
index 355370c66de0..ab1867033f26 100644
--- a/fs/smb/server/notify.c
+++ b/fs/smb/server/notify.c
@@ -42,12 +42,17 @@ struct ksmbd_notify {
u32 filter;
u32 mask;
bool watch_tree;
+ struct ksmbd_notify_event *moved_from_event;
+ u32 moved_from_mask;
+ u32 moved_from_cookie;
+ struct delayed_work moved_from_work;
};
struct ksmbd_notify_req {
wait_queue_head_t wait;
};
+#define KSMBD_NOTIFY_MOVED_FROM_MSECS 100
#define KSMBD_NOTIFY_NAME_EVENT_MASK (FS_CREATE | FS_DELETE | \
FS_MOVED_FROM | FS_MOVED_TO)
#define KSMBD_NOTIFY_EVENT_MASK (FS_ATTRIB | FS_MODIFY | \
@@ -172,6 +177,65 @@ ksmbd_notify_queue_event(struct ksmbd_notify *notify,
spin_unlock(¬ify->lock);
}
+static void
+ksmbd_notify_trigger_removed(struct ksmbd_notify *notify,
+ struct ksmbd_notify_event *event)
+{
+ ksmbd_debug(NOTIFY,
+ "Queue moved from as removed, name %s\n",
+ event->name);
+ event->action = FILE_ACTION_REMOVED;
+ event->when = ktime_get_ns();
+ ksmbd_notify_queue_event(notify, event);
+}
+
+static void ksmbd_notify_moved_from_timeout(struct work_struct *work)
+{
+ struct ksmbd_notify_event *event;
+ struct ksmbd_notify *notify;
+
+ notify = container_of(to_delayed_work(work), struct ksmbd_notify,
+ moved_from_work);
+
+ spin_lock(¬ify->lock);
+ event = notify->moved_from_event;
+ notify->moved_from_event = NULL;
+ spin_unlock(¬ify->lock);
+
+ if (!event)
+ return;
+ ksmbd_notify_trigger_removed(notify, event);
+}
+
+static void ksmbd_notify_save_moved_from(struct ksmbd_notify *notify,
+ u32 mask, u32 cookie,
+ const struct qstr *file_name)
+{
+ struct ksmbd_notify_event *event, *old_event;
+
+ event = ksmbd_notify_alloc_event(FILE_ACTION_RENAMED_OLD_NAME,
+ file_name, KSMBD_DEFAULT_GFP);
+ if (!event)
+ return;
+
+ spin_lock(¬ify->lock);
+ old_event = notify->moved_from_event;
+ notify->moved_from_event = event;
+ notify->moved_from_mask = mask;
+ notify->moved_from_cookie = cookie;
+ spin_unlock(¬ify->lock);
+
+ ksmbd_debug(NOTIFY,
+ "Saved moved from, mask 0x%x, name %.*s, cookie %u\n",
+ mask, file_name ? file_name->len : 0,
+ file_name ? (const char *)file_name->name : "", cookie);
+ if (old_event)
+ ksmbd_notify_trigger_removed(notify, old_event);
+
+ mod_delayed_work(system_dfl_wq, ¬ify->moved_from_work,
+ msecs_to_jiffies(KSMBD_NOTIFY_MOVED_FROM_MSECS));
+}
+
static int ksmbd_notify_handle_inode_event(struct ksmbd_notify *notify,
u32 mask, struct inode *inode,
struct inode *dir,
@@ -197,6 +261,14 @@ static int ksmbd_notify_handle_inode_event(struct ksmbd_notify *notify,
return 0;
}
+ if (mask & FS_MOVED_FROM) {
+ ksmbd_notify_save_moved_from(notify, mask, cookie, file_name);
+ return 0;
+ }
+
+ if (mask & FS_MOVED_TO)
+ return 0;
+
if (mask & FS_CREATE) {
action = FILE_ACTION_ADDED;
} else if (mask & FS_DELETE) {
@@ -433,6 +505,8 @@ static int ksmbd_notify_add(struct ksmbd_file *fp, u32 mask, u32 filter,
notify->filter = filter;
notify->mask = mask;
notify->watch_tree = watch_tree;
+ INIT_DELAYED_WORK(¬ify->moved_from_work,
+ ksmbd_notify_moved_from_timeout);
notify->group = fsnotify_alloc_group(&ksmbd_notify_fsnotify_ops, 0);
if (IS_ERR(notify->group)) {
@@ -507,6 +581,8 @@ void ksmbd_notify_remove(struct ksmbd_file *fp)
(unsigned long long)file_inode(fp->filp)->i_ino,
notify->mark->mask, notify->watch_tree);
ksmbd_notify_destroy_marks(notify);
+ cancel_delayed_work_sync(¬ify->moved_from_work);
+ kfree(notify->moved_from_event);
ksmbd_notify_free_events(¬ify->events);
kfree(notify);
}
--
2.55.0
next prev parent reply other threads:[~2026-09-26 9:06 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-09-26 9:05 [PATCH 00/12] smb/server: change notify support ChenXiaoSong
2026-09-26 9:05 ` [PATCH 01/12] smb/server: move change notify handling into notify.c ChenXiaoSong
2026-09-26 9:05 ` [PATCH 02/12] smb/server: add more validation for change notify requests ChenXiaoSong
2026-09-26 9:05 ` [PATCH 03/12] smb/server: add debug type for change notify ChenXiaoSong
2026-09-26 9:05 ` [PATCH 04/12] smb/server: support non-recursive directory change watches ChenXiaoSong
2026-09-27 10:51 ` Namjae Jeon
2026-09-28 0:38 ` ChenXiaoSong
2026-09-26 9:05 ` [PATCH 05/12] smb/server: support recursive " ChenXiaoSong
2026-09-26 9:05 ` [PATCH 06/12] smb/server: keep notify watches on file handles ChenXiaoSong
2026-09-26 9:05 ` [PATCH 07/12] smb/server: save simple notify events ChenXiaoSong
2026-09-27 10:31 ` Namjae Jeon
2026-09-28 1:27 ` ChenXiaoSong
2026-09-26 9:05 ` ChenXiaoSong [this message]
2026-09-26 9:05 ` [PATCH 09/12] smb/server: match rename " ChenXiaoSong
2026-09-26 9:05 ` [PATCH 10/12] smb/server: encode " ChenXiaoSong
2026-09-26 9:05 ` [PATCH 11/12] smb/server: send notify events to the client ChenXiaoSong
2026-09-26 9:05 ` [PATCH 12/12] smb/server: break directory leases before sending notify events ChenXiaoSong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260926090518.78547-9-chenxiaosong@chenxiaosong.com \
--to=chenxiaosong@chenxiaosong.com \
--cc=chenxiaosong@kylinos.cn \
--cc=linkinjeon@kernel.org \
--cc=linux-cifs@vger.kernel.org \
--cc=senozhatsky@chromium.org \
--cc=tom@talpey.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox