Changeset 228 for branches/samba-3.2.x/source/smbd/files.c

Timestamp:

May 26, 2009, 9:44:50 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update 3.2 branch to 3.2.6

File:

• branches/samba-3.2.x/source/smbd/files.c (modified) (6 diffs)

branches/samba-3.2.x/source/smbd/files.c

@@ -123 +123 @@
         chain_fsp = fsp;
 
-        /* A new fsp invalidates a negative fsp_fi_cache. */
-        if (fsp_fi_cache.fsp == NULL) {
-                ZERO_STRUCT(fsp_fi_cache);
-        }
+        /* A new fsp invalidates the positive and
+          negative fsp_fi_cache as the new fsp is pushed
+          at the start of the list and we search from
+          a cache hit to the *end* of the list. */
+
+        ZERO_STRUCT(fsp_fi_cache);
+
+        conn->num_files_open++;
 
         *result = fsp;
@@ -327 +331 @@
 
         for (fsp=Files;fsp;fsp=fsp->next) {
-                if ( fsp->fh->fd != -1 &&
-                     file_id_equal(&fsp->file_id, &id)) {
+                if (file_id_equal(&fsp->file_id, &id)) {
                         /* Setup positive cache. */
                         fsp_fi_cache.fsp = fsp;
@@ -349 +352 @@
 
         for (fsp = start_fsp->next;fsp;fsp=fsp->next) {
-                if ( fsp->fh->fd != -1 &&
-                     file_id_equal(&fsp->file_id, &start_fsp->file_id)) {
+                if (file_id_equal(&fsp->file_id, &start_fsp->file_id)) {
                         return fsp;
                 }
@@ -428 +430 @@
                  fsp->fnum, files_used));
 
-        /* this is paranoia, just in case someone tries to reuse the 
-           information */
-        ZERO_STRUCTP(fsp);
+        fsp->conn->num_files_open--;
 
         if (fsp == chain_fsp) {
@@ -445 +445 @@
                 vfs_remove_fsp_extension(fsp->vfs_extension->owner, fsp);
         }
+
+        /* this is paranoia, just in case someone tries to reuse the
+           information */
+        ZERO_STRUCTP(fsp);
 
         SAFE_FREE(fsp);
@@ -501 +505 @@
 ****************************************************************************/
 
-NTSTATUS dup_file_fsp(files_struct *fsp,
-                                uint32 access_mask,
-                                uint32 share_access,
-                                uint32 create_options,
-                                files_struct **result)
-{
-        NTSTATUS status;
-        files_struct *dup_fsp;
-
-        status = file_new(fsp->conn, &dup_fsp);
-
-        if (!NT_STATUS_IS_OK(status)) {
-                return status;
-        }
-
-        SAFE_FREE(dup_fsp->fh);
-
-        dup_fsp->fh = fsp->fh;
-        dup_fsp->fh->ref_count++;
-
-        dup_fsp->file_id = fsp->file_id;
-        dup_fsp->initial_allocation_size = fsp->initial_allocation_size;
-        dup_fsp->mode = fsp->mode;
-        dup_fsp->file_pid = fsp->file_pid;
-        dup_fsp->vuid = fsp->vuid;
-        dup_fsp->open_time = fsp->open_time;
-        dup_fsp->access_mask = access_mask;
-        dup_fsp->share_access = share_access;
-        dup_fsp->oplock_type = fsp->oplock_type;
-        dup_fsp->can_lock = fsp->can_lock;
-        dup_fsp->can_read = (access_mask & (FILE_READ_DATA)) ? True : False;
-        if (!CAN_WRITE(fsp->conn)) {
-                dup_fsp->can_write = False;
+void dup_file_fsp(files_struct *from,
+                        uint32 access_mask,
+                        uint32 share_access,
+                        uint32 create_options,
+                        files_struct *to)
+{
+        SAFE_FREE(to->fh);
+
+        to->fh = from->fh;
+        to->fh->ref_count++;
+
+        to->file_id = from->file_id;
+        to->initial_allocation_size = from->initial_allocation_size;
+        to->mode = from->mode;
+        to->file_pid = from->file_pid;
+        to->vuid = from->vuid;
+        to->open_time = from->open_time;
+        to->access_mask = access_mask;
+        to->share_access = share_access;
+        to->oplock_type = from->oplock_type;
+        to->can_lock = from->can_lock;
+        to->can_read = (access_mask & (FILE_READ_DATA)) ? True : False;
+        if (!CAN_WRITE(from->conn)) {
+                to->can_write = False;
         } else {
-                dup_fsp->can_write = (access_mask & (FILE_WRITE_DATA | FILE_APPEND_DATA)) ? True : False;
-        }
-        dup_fsp->print_file = fsp->print_file;
-        dup_fsp->modified = fsp->modified;
-        dup_fsp->is_directory = fsp->is_directory;
-        dup_fsp->is_stat = fsp->is_stat;
-        dup_fsp->aio_write_behind = fsp->aio_write_behind;
-        string_set(&dup_fsp->fsp_name,fsp->fsp_name);
-
-        *result = dup_fsp;
-        return NT_STATUS_OK;
-}
+                to->can_write = (access_mask & (FILE_WRITE_DATA | FILE_APPEND_DATA)) ? True : False;
+        }
+        to->print_file = from->print_file;
+        to->modified = from->modified;
+        to->is_directory = from->is_directory;
+        to->is_stat = from->is_stat;
+        to->aio_write_behind = from->aio_write_behind;
+        string_set(&to->fsp_name,from->fsp_name);
+}