Changeset 988 for vendor/current/lib/util/idtree.c

Timestamp:

Nov 24, 2016, 1:14:11 PM (9 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to version 4.4.3

File:

• vendor/current/lib/util/idtree.c (modified) (9 diffs)

vendor/current/lib/util/idtree.c

@@ -1 @@
-/* 
+/*
    Unix SMB/CIFS implementation.
 
@@ -7 +7 @@
    Copyright (C) Andrew Tridgell 2004
 
-   This code is derived from lib/idr.c in the 2.6 Linux kernel, which was 
+   This code is derived from lib/idr.c in the 2.6 Linux kernel, which was
    written by Jim Houston jim.houston@ccur.com, and is
    Copyright (C) 2002 by Concurrent Computer Corporation
-    
+
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or
    (at your option) any later version.
-   
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-   
+
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
@@ -33 +33 @@
  */
 
-#include "includes.h"
+#include "replace.h"
+#include <talloc.h>
+#include "debug.h"
+#include "idtree.h"
 
 #define IDR_BITS 5
@@ -51 +54 @@
 #define clear_bit(bit, v) (v) &= ~(1<<(bit))
 #define test_bit(bit, v) ((v) & (1<<(bit)))
-                                   
+
 struct idr_layer {
         uint32_t                 bitmap;
@@ -140 +143 @@
                         sh = IDR_BITS * (l + 1);
                         if (oid >> sh == id >> sh)
-                        continue;
+                                continue;
                         else
                                 goto restart;
@@ -179 +182 @@
         n = id;
         while (p->bitmap == IDR_FULL) {
-                if (!(p = pa[++l]))
+                if (l >= MAX_LEVEL) {
                         break;
+                }
+                p = pa[++l];
+                if (p == NULL) {
+                        break;
+                }
                 n = n >> IDR_BITS;
                 set_bit((n & IDR_MASK), p->bitmap);
@@ -193 +201 @@
 
         idr_pre_get(idp);
-        
+
         id = starting_id;
 build_up:
@@ -307 +315 @@
         }
 
-        if ( idp->top && idp->top->count == 1 && 
+        if ( idp->top && idp->top->count == 1 &&
              (idp->layers > 1) &&
              idp->top->ary[0]) {
@@ -367 +375 @@
 
 /**
-  allocate a new id randomly in the given range
-*/
-_PUBLIC_ int idr_get_new_random(struct idr_context *idp, void *ptr, int limit)
-{
-        int id;
-
-        /* first try a random starting point in the whole range, and if that fails,
-           then start randomly in the bottom half of the range. This can only
-           fail if the range is over half full, and finally fallback to any
-           free id */
-        id = idr_get_new_above(idp, ptr, 1+(generate_random() % limit), limit);
-        if (id == -1) {
-                id = idr_get_new_above(idp, ptr, 1+(generate_random()%(limit/2)), limit);
-        }
-        if (id == -1) {
-                id = idr_get_new_above(idp, ptr, 1, limit);
-        }
-
-        return id;
-}
-
-/**
   find a pointer value previously set with idr_get_new given an id
 */