Changeset 988 for vendor/current/source3/smbd/dfree.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/source3/smbd/dfree.c (modified) (11 diffs)

vendor/current/source3/smbd/dfree.c

@@ -26 +26 @@
 ****************************************************************************/
 
-static void disk_norm(bool small_query, uint64_t *bsize,uint64_t *dfree,uint64_t *dsize)
+static void disk_norm(uint64_t *bsize, uint64_t *dfree, uint64_t *dsize)
 {
         /* check if the disk is beyond the max disk size */
-        uint64_t maxdisksize = lp_maxdisksize();
+        uint64_t maxdisksize = lp_max_disk_size();
         if (maxdisksize) {
                 /* convert to blocks - and don't overflow */
                 maxdisksize = ((maxdisksize*1024)/(*bsize))*1024;
-                if (*dsize > maxdisksize) *dsize = maxdisksize;
-                if (*dfree > maxdisksize) *dfree = maxdisksize-1; 
+                if (*dsize > maxdisksize) {
+                        *dsize = maxdisksize;
+                }
+                if (*dfree > maxdisksize) {
+                        *dfree = maxdisksize - 1;
+                }
                 /* the -1 should stop applications getting div by 0
                    errors */
-        }  
-
-        if(small_query) {       
-                while (*dfree > WORDMAX || *dsize > WORDMAX || *bsize < 512) {
-                        *dfree /= 2;
-                        *dsize /= 2;
-                        *bsize *= 2;
-                        /*
-                         * Force max to fit in 16 bit fields.
-                         */
-                        if (*bsize > (WORDMAX*512)) {
-                                *bsize = (WORDMAX*512);
-                                if (*dsize > WORDMAX)
-                                        *dsize = WORDMAX;
-                                if (*dfree >  WORDMAX)
-                                        *dfree = WORDMAX;
-                                break;
-                        }
-                }
         }
 }
@@ -65 +50 @@
 ****************************************************************************/
 
-uint64_t sys_disk_free(connection_struct *conn, const char *path, bool small_query, 
-                              uint64_t *bsize,uint64_t *dfree,uint64_t *dsize)
+uint64_t sys_disk_free(connection_struct *conn, const char *path,
+                       uint64_t *bsize, uint64_t *dfree, uint64_t *dsize)
 {
         uint64_t dfree_retval;
@@ -73 +58 @@
         uint64_t dsize_q = 0;
         const char *dfree_command;
+        static bool dfree_broken = false;
 
         (*dfree) = (*dsize) = 0;
@@ -81 +67 @@
          */
 
-        dfree_command = lp_dfree_command(SNUM(conn));
+        dfree_command = lp_dfree_command(talloc_tos(), SNUM(conn));
         if (dfree_command && *dfree_command) {
                 const char *p;
@@ -96 +82 @@
                 }
 
-                DEBUG (3, ("disk_free: Running command %s\n", syscmd));
+                DEBUG (3, ("disk_free: Running command '%s'\n", syscmd));
 
                 lines = file_lines_pload(syscmd, NULL);
-                if (lines) {
+                if (lines != NULL) {
                         char *line = lines[0];
 
@@ -123 +109 @@
                         if (!*dfree)
                                 *dfree = 1024;
-                } else {
-                        DEBUG (0, ("disk_free: sys_popen() failed for command %s. Error was : %s\n",
-                                syscmd, strerror(errno) ));
-                        if (sys_fsusage(path, dfree, dsize) != 0) {
-                                DEBUG (0, ("disk_free: sys_fsusage() failed. Error was : %s\n",
-                                        strerror(errno) ));
-                                return (uint64_t)-1;
-                        }
-                }
-        } else {
-                if (sys_fsusage(path, dfree, dsize) != 0) {
-                        DEBUG (0, ("disk_free: sys_fsusage() failed. Error was : %s\n",
-                                strerror(errno) ));
-                        return (uint64_t)-1;
-                }
-        }
-
-        if (disk_quotas(path, &bsize_q, &dfree_q, &dsize_q)) {
-                (*bsize) = bsize_q;
+
+                        goto dfree_done;
+                }
+                DEBUG (0, ("disk_free: file_lines_load() failed for "
+                           "command '%s'. Error was : %s\n",
+                           syscmd, strerror(errno) ));
+        }
+
+        if (SMB_VFS_DISK_FREE(conn, path, bsize, dfree, dsize) ==
+            (uint64_t)-1) {
+                DBG_ERR("VFS disk_free failed. Error was : %s\n",
+                        strerror(errno));
+                return (uint64_t)-1;
+        }
+
+        if (disk_quotas(conn, path, &bsize_q, &dfree_q, &dsize_q)) {
+                uint64_t min_bsize = MIN(*bsize, bsize_q);
+
+                (*dfree) = (*dfree) * (*bsize) / min_bsize;
+                (*dsize) = (*dsize) * (*bsize) / min_bsize;
+                dfree_q = dfree_q * bsize_q / min_bsize;
+                dsize_q = dsize_q * bsize_q / min_bsize;
+
+                (*bsize) = min_bsize;
                 (*dfree) = MIN(*dfree,dfree_q);
                 (*dsize) = MIN(*dsize,dsize_q);
@@ -161 +152 @@
         }
 
-        disk_norm(small_query,bsize,dfree,dsize);
+dfree_done:
+        disk_norm(bsize, dfree, dsize);
 
         if ((*bsize) < 1024) {
@@ -178 +170 @@
 uint64_t get_dfree_info(connection_struct *conn,
                         const char *path,
-                        bool small_query,
                         uint64_t *bsize,
                         uint64_t *dfree,
@@ -188 +179 @@
 
         if (!dfree_cache_time) {
-                return SMB_VFS_DISK_FREE(conn,path,small_query,bsize,dfree,dsize);
+                return sys_disk_free(conn, path, bsize, dfree, dsize);
         }
 
@@ -199 +190 @@
         }
 
-        dfree_ret = SMB_VFS_DISK_FREE(conn,path,small_query,bsize,dfree,dsize);
+        dfree_ret = sys_disk_free(conn, path, bsize, dfree, dsize);
 
         if (dfree_ret == (uint64_t)-1) {
@@ -208 +199 @@
         /* No cached info or time to refresh. */
         if (!dfc) {
-                dfc = TALLOC_P(conn, struct dfree_cached_info);
+                dfc = talloc(conn, struct dfree_cached_info);
                 if (!dfc) {
                         return dfree_ret;