r20634: A *LOT* more work is necessary before touching notify remotely starts to make

sense. Until then, remove it from the tree to keep the diff between 3_0_24 and
3_0 small.

Volker
(This used to be commit f146a85e74c84e78a11e616a1cbeaeef4693a0e0)

1 files changed, 3 insertions, 58 deletions

diff --git a/source3/include/smb.h b/source3/include/smb.h
index a7461b422c..c8126c43c3 100644
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -428,49 +428,6 @@ struct vfs_fsp_data {
      */
 };
 
-/* the basic packet size, assuming no words or bytes */
-#define smb_size 39
-
-struct notify_change {
-	uint32_t action;
-	char *name;
-};
-
-struct notify_change_request {
-	struct notify_change_request *prev, *next;
-	struct files_struct *fsp;	/* backpointer for cancel by mid */
-	char request_buf[smb_size];
-	uint32 filter;
-	uint32 max_param_count;
-	struct notify_mid_map *mid_map;
-};
-
-/*
- * For NTCancel, we need to find the notify_change_request indexed by
- * mid. Separate list here.
- */
-
-struct notify_mid_map {
-	struct notify_mid_map *prev, *next;
-	struct notify_change_request *req;
-	uint16 mid;
-};
-
-struct notify_change_buf {
-	/*
-	 * If no requests are pending, changes are queued here. Simple array,
-	 * we only append.
-	 */
-	unsigned num_changes;
-	struct notify_change *changes;
-
-	/*
-	 * If no changes are around requests are queued here. Using a linked
-	 * list, because we have to append at the end and delete from the top.
-	 */
-	struct notify_change_request *requests;
-};
-
 typedef struct files_struct {
 	struct files_struct *next, *prev;
 	int fnum;
@@ -513,8 +470,6 @@ typedef struct files_struct {
 
 	struct vfs_fsp_data *vfs_extension;
  	FAKE_FILE_HANDLE *fake_file_handle;
-
-	struct notify_change_buf *notify;
 } files_struct;
 
 #include "ntquotas.h"
@@ -924,6 +879,9 @@ struct bitmap {
 	unsigned int n;
 };
 
+/* the basic packet size, assuming no words or bytes */
+#define smb_size 39
+
 /* offsets into message for common items */
 #define smb_com 8
 #define smb_rcls 9
@@ -1385,19 +1343,6 @@ struct bitmap {
 #define FILE_NOTIFY_CHANGE_SECURITY    0x100
 #define FILE_NOTIFY_CHANGE_FILE_NAME   0x200
 
-#define FILE_NOTIFY_CHANGE_NAME \
-	(FILE_NOTIFY_CHANGE_FILE_NAME|FILE_NOTIFY_CHANGE_DIR_NAME)
-
-/* change notify action results */
-#define NOTIFY_ACTION_ADDED 1
-#define NOTIFY_ACTION_REMOVED 2
-#define NOTIFY_ACTION_MODIFIED 3
-#define NOTIFY_ACTION_OLD_NAME 4
-#define NOTIFY_ACTION_NEW_NAME 5
-#define NOTIFY_ACTION_ADDED_STREAM 6
-#define NOTIFY_ACTION_REMOVED_STREAM 7
-#define NOTIFY_ACTION_MODIFIED_STREAM 8
-
 
 /* where to find the base of the SMB packet proper */
 #define smb_base(buf) (((char *)(buf))+4)