s3: smbd: notify_mid_maps is used by both SMB1 and SMB2.

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: David Mulder <dmulder@samba.org>

diff --git a/source3/smbd/globals.h b/source3/smbd/globals.h
index b5bb26d1e36afbd899f8cad4284ceed22d4fa76b..2d391ec3da1d1336c9ef68db502561ad18ce1f72 100644 (file)
--- a/source3/smbd/globals.h
+++ b/source3/smbd/globals.h
@@ -897,9 +897,7 @@ struct smbd_server_connection {
                struct kernel_oplocks *kernel_ops;
        } oplocks;
 
-       struct {
-               struct notify_mid_map *notify_mid_maps;
-       } smb1;
+       struct notify_mid_map *notify_mid_maps;
 
        struct pthreadpool_tevent *pool;
 

diff --git a/source3/smbd/notify.c b/source3/smbd/notify.c
index 4de62aba4f1871dfdfd0b26d39f734ae77cd81ae..c18ad0027b67703d584d79db0aa3bd6157107930 100644 (file)
--- a/source3/smbd/notify.c
+++ b/source3/smbd/notify.c
@@ -366,7 +366,7 @@ NTSTATUS change_notify_add_request(struct smb_request *req,
        DLIST_ADD_END(fsp->notify->requests, request);
 
        map->mid = request->req->mid;
-       DLIST_ADD(sconn->smb1.notify_mid_maps, map);
+       DLIST_ADD(sconn->notify_mid_maps, map);
 
        return NT_STATUS_OK;
 }
@@ -396,7 +396,7 @@ static void change_notify_remove_request(struct smbd_server_connection *sconn,
        }
 
        DLIST_REMOVE(fsp->notify->requests, req);
-       DLIST_REMOVE(sconn->smb1.notify_mid_maps, req->mid_map);
+       DLIST_REMOVE(sconn->notify_mid_maps, req->mid_map);
        TALLOC_FREE(req);
 }
 
@@ -443,7 +443,7 @@ bool remove_pending_change_notify_requests_by_mid(
 {
        struct notify_mid_map *map;
 
-       for (map = sconn->smb1.notify_mid_maps; map; map = map->next) {
+       for (map = sconn->notify_mid_maps; map; map = map->next) {
                if (map->mid == mid) {
                        break;
                }
@@ -462,7 +462,7 @@ void smbd_notify_cancel_by_smbreq(const struct smb_request *smbreq)
        struct smbd_server_connection *sconn = smbreq->sconn;
        struct notify_mid_map *map;
 
-       for (map = sconn->smb1.notify_mid_maps; map; map = map->next) {
+       for (map = sconn->notify_mid_maps; map; map = map->next) {
                if (map->req->req == smbreq) {
                        break;
                }