Changeset 745 for trunk/server/source3/modules/vfs_tsmsm.c

Timestamp:

Nov 27, 2012, 4:43:17 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.0

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source3/modules/vfs_tsmsm.c (modified) (6 diffs)

trunk/server/source3/modules/vfs_tsmsm.c

@@ -40 +40 @@
 
 #include "includes.h"
+#include "smbd/smbd.h"
 
 #ifndef USE_DMAPI
@@ -147 +148 @@
 
 static bool tsmsm_is_offline(struct vfs_handle_struct *handle, 
-                            const char *path,
-                            SMB_STRUCT_STAT *stbuf) {
+                             const struct smb_filename *fname,
+                             SMB_STRUCT_STAT *stbuf)
+{
         struct tsmsm_struct *tsmd = (struct tsmsm_struct *) handle->data;
         const dm_sessid_t *dmsession_id;
@@ -159 +161 @@
         char *buf = NULL;
         size_t buflen;
+        NTSTATUS status;
+        char *path;
+
+        status = get_full_smb_filename(talloc_tos(), fname, &path);
+        if (!NT_STATUS_IS_OK(status)) {
+                errno = map_errno_from_nt_status(status);
+                return false;
+        }
 
         /* if the file has more than FILE_IS_ONLINE_RATIO of blocks available,
            then assume it is not offline (it may not be 100%, as it could be sparse) */
-        if (512 * (off_t)stbuf->st_ex_blocks >=
+        if (512 * stbuf->st_ex_blocks >=
             stbuf->st_ex_size * tsmd->online_ratio) {
-                DEBUG(10,("%s not offline: st_blocks=%ld st_size=%ld "
+                DEBUG(10,("%s not offline: st_blocks=%llu st_size=%llu "
                           "online_ratio=%.2f\n", path,
-                          (long)stbuf->st_ex_blocks,
-                          (long)stbuf->st_ex_size, tsmd->online_ratio));
+                          (unsigned long long)stbuf->st_ex_blocks,
+                          (unsigned long long)stbuf->st_ex_size, tsmd->online_ratio));
                 return false;
         }
@@ -264 +274 @@
         */
         if(SMB_VFS_FSTAT(fsp, &sbuf) == 0) {
-                DEBUG(10,("tsmsm_aio_force st_blocks=%ld st_size=%ld "
-                          "online_ratio=%.2f\n", (long)sbuf.st_ex_blocks,
-                          (long)sbuf.st_ex_size, tsmd->online_ratio));
-                return !(512 * (off_t)sbuf.st_ex_blocks >=
+                DEBUG(10,("tsmsm_aio_force st_blocks=%llu st_size=%llu "
+                          "online_ratio=%.2f\n", (unsigned long long)sbuf.st_ex_blocks,
+                          (unsigned long long)sbuf.st_ex_size, tsmd->online_ratio));
+                return !(512 * sbuf.st_ex_blocks >=
                          sbuf.st_ex_size * tsmd->online_ratio);
         }
@@ -341 +351 @@
 
 static int tsmsm_set_offline(struct vfs_handle_struct *handle, 
-                             const char *path) {
+                             const struct smb_filename *fname)
+{
         struct tsmsm_struct *tsmd = (struct tsmsm_struct *) handle->data;
         int result = 0;
         char *command;
+        NTSTATUS status;
+        char *path;
 
         if (tsmd->hsmscript == NULL) {
@@ -351 +364 @@
                 return 0;
         }
+
+        status = get_full_smb_filename(talloc_tos(), fname, &path);
+        if (!NT_STATUS_IS_OK(status)) {
+                errno = map_errno_from_nt_status(status);
+                return false;
+        }
 
         /* Now, call the script */