From: ChenXiaoSong Date: Thu, 6 Nov 2025 09:15:15 +0000 (+0800) Subject: smb: move SMB2 Notify Action Flags into common/smb2pdu.h X-Git-Tag: v6.19-rc1~26^2~4 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6539e18517b62815fa5445ad38de51036d5572d8;p=thirdparty%2Fkernel%2Flinux.git smb: move SMB2 Notify Action Flags into common/smb2pdu.h Some of these definitions are already in common/smb2pdu.h. Remove the duplicate client side definitions, and add all SMB2 Notify Action Flags to common header file. Signed-off-by: ChenXiaoSong Signed-off-by: Steve French --- diff --git a/fs/smb/client/cifspdu.h b/fs/smb/client/cifspdu.h index d93c7aae7d60..0e7860f1e968 100644 --- a/fs/smb/client/cifspdu.h +++ b/fs/smb/client/cifspdu.h @@ -1358,15 +1358,6 @@ typedef struct smb_com_transaction_change_notify_rsp { /* __u8 Pad[3]; */ } __packed TRANSACT_CHANGE_NOTIFY_RSP; -#define FILE_ACTION_ADDED 0x00000001 -#define FILE_ACTION_REMOVED 0x00000002 -#define FILE_ACTION_MODIFIED 0x00000003 -#define FILE_ACTION_RENAMED_OLD_NAME 0x00000004 -#define FILE_ACTION_RENAMED_NEW_NAME 0x00000005 -#define FILE_ACTION_ADDED_STREAM 0x00000006 -#define FILE_ACTION_REMOVED_STREAM 0x00000007 -#define FILE_ACTION_MODIFIED_STREAM 0x00000008 - /* * response contains array of the following structures * See MS-FSCC 2.7.1 diff --git a/fs/smb/common/smb2pdu.h b/fs/smb/common/smb2pdu.h index 5ae54b78a71e..950aadade401 100644 --- a/fs/smb/common/smb2pdu.h +++ b/fs/smb/common/smb2pdu.h @@ -1016,6 +1016,8 @@ struct smb2_set_info_rsp { #define FILE_ACTION_REMOVED_STREAM 0x00000007 #define FILE_ACTION_MODIFIED_STREAM 0x00000008 #define FILE_ACTION_REMOVED_BY_DELETE 0x00000009 +#define FILE_ACTION_ID_NOT_TUNNELLED 0x0000000A +#define FILE_ACTION_TUNNELLED_ID_COLLISION 0x0000000B /* See MS-SMB2 2.2.35 */ struct smb2_change_notify_req {