Skip to content

Commit 6539e18

Browse files
ChenXiaoSongsmfrench
authored andcommitted
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 <chenxiaosong@kylinos.cn> Signed-off-by: Steve French <stfrench@microsoft.com>
1 parent 9ec7629 commit 6539e18

2 files changed

Lines changed: 2 additions & 9 deletions

File tree

fs/smb/client/cifspdu.h

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1358,15 +1358,6 @@ typedef struct smb_com_transaction_change_notify_rsp {
13581358
/* __u8 Pad[3]; */
13591359
} __packed TRANSACT_CHANGE_NOTIFY_RSP;
13601360

1361-
#define FILE_ACTION_ADDED 0x00000001
1362-
#define FILE_ACTION_REMOVED 0x00000002
1363-
#define FILE_ACTION_MODIFIED 0x00000003
1364-
#define FILE_ACTION_RENAMED_OLD_NAME 0x00000004
1365-
#define FILE_ACTION_RENAMED_NEW_NAME 0x00000005
1366-
#define FILE_ACTION_ADDED_STREAM 0x00000006
1367-
#define FILE_ACTION_REMOVED_STREAM 0x00000007
1368-
#define FILE_ACTION_MODIFIED_STREAM 0x00000008
1369-
13701361
/*
13711362
* response contains array of the following structures
13721363
* See MS-FSCC 2.7.1

fs/smb/common/smb2pdu.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1016,6 +1016,8 @@ struct smb2_set_info_rsp {
10161016
#define FILE_ACTION_REMOVED_STREAM 0x00000007
10171017
#define FILE_ACTION_MODIFIED_STREAM 0x00000008
10181018
#define FILE_ACTION_REMOVED_BY_DELETE 0x00000009
1019+
#define FILE_ACTION_ID_NOT_TUNNELLED 0x0000000A
1020+
#define FILE_ACTION_TUNNELLED_ID_COLLISION 0x0000000B
10191021

10201022
/* See MS-SMB2 2.2.35 */
10211023
struct smb2_change_notify_req {

0 commit comments

Comments
 (0)