Second part of the fix for bug #5790 - samba returns STATUS_OBJECT_NAME_NOT_FOUND...

[jra/samba/.git] / source3 / smbd / files.c

diff --git a/source3/smbd/files.c b/source3/smbd/files.c
index 9994b50d15ae3c41f2ceaffa337a48af72f9554e..8d06e20f810f541c5f63ec858c3baf3d7f186ecf 100644 (file)
--- a/source3/smbd/files.c
+++ b/source3/smbd/files.c
@@ -5,7 +5,7 @@
    
    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
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
    
    This program is distributed in the hope that it will be useful,
@@ -14,8 +14,7 @@
    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, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "includes.h"
@@ -123,10 +122,12 @@ NTSTATUS file_new(connection_struct *conn, files_struct **result)
 
        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);
 
        *result = fsp;
        return NT_STATUS_OK;
@@ -234,7 +235,7 @@ void file_dump_open_table(void)
        for (fsp=Files;fsp;fsp=fsp->next,count++) {
                DEBUG(10,("Files[%d], fnum = %d, name %s, fd = %d, gen = %lu, fileid=%s\n",
                        count, fsp->fnum, fsp->fsp_name, fsp->fh->fd, (unsigned long)fsp->fh->gen_id,
-                         file_id_static_string(&fsp->file_id)));
+                         file_id_string_tos(&fsp->file_id)));
        }
 }
 
@@ -281,7 +282,7 @@ files_struct *file_find_dif(struct file_id id, unsigned long gen_id)
                            (fsp->oplock_type != FAKE_LEVEL_II_OPLOCK)) {
                                DEBUG(0,("file_find_dif: file %s file_id = %s, gen = %u \
 oplock_type = %u is a stat open with oplock type !\n", fsp->fsp_name, 
-                                        file_id_static_string(&fsp->file_id),
+                                        file_id_string_tos(&fsp->file_id),
                                         (unsigned int)fsp->fh->gen_id,
                                         (unsigned int)fsp->oplock_type ));
                                smb_panic("file_find_dif");
@@ -327,8 +328,7 @@ files_struct *file_find_di_first(struct file_id id)
        fsp_fi_cache.id = id;
 
        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;
                        return fsp;
@@ -349,8 +349,7 @@ files_struct *file_find_di_next(files_struct *start_fsp)
        files_struct *fsp;
 
        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;
                }
        }
@@ -375,29 +374,6 @@ files_struct *file_find_print(void)
        return NULL;
 }
 
-/****************************************************************************
- Set a pending modtime across all files with a given dev/ino pair.
- Record the owner of that modtime.
-****************************************************************************/
-
-void fsp_set_pending_modtime(files_struct *tfsp, const struct timespec mod)
-{
-       files_struct *fsp;
-
-       if (null_timespec(mod)) {
-               return;
-       }
-
-       for (fsp = Files;fsp;fsp=fsp->next) {
-               if ( fsp->fh->fd != -1 && file_id_equal(&fsp->file_id, &tfsp->file_id)) {
-                       fsp->pending_modtime = mod;
-                       fsp->pending_modtime_owner = False;
-               }
-       }
-
-       tfsp->pending_modtime_owner = True;
-}
-
 /****************************************************************************
  Sync open files on a connection.
 ****************************************************************************/
@@ -442,6 +418,9 @@ void file_free(files_struct *fsp)
        /* Ensure this event will never fire. */
        TALLOC_FREE(fsp->oplock_timeout);
 
+       /* Ensure this event will never fire. */
+       TALLOC_FREE(fsp->update_write_time_event);
+
        bitmap_clear(file_bmap, fsp->fnum - FILE_HANDLE_OFFSET);
        files_used--;
 
@@ -461,6 +440,11 @@ void file_free(files_struct *fsp)
                ZERO_STRUCT(fsp_fi_cache);
        }
 
+       /* Drop all remaining extensions. */
+       while (fsp->vfs_extension) {
+               vfs_remove_fsp_extension(fsp->vfs_extension->owner, fsp);
+       }
+
        SAFE_FREE(fsp);
 }
 
@@ -488,7 +472,7 @@ files_struct *file_fnum(uint16 fnum)
  Get an fsp from a packet given the offset of a 16 bit fnum.
 ****************************************************************************/
 
-files_struct *file_fsp(char *buf, int where)
+files_struct *file_fsp(uint16 fid)
 {
        files_struct *fsp;
 
@@ -496,11 +480,7 @@ files_struct *file_fsp(char *buf, int where)
                return chain_fsp;
        }
 
-       if (!buf) {
-               return NULL;
-       }
-
-       fsp = file_fnum(SVAL(buf, where));
+       fsp = file_fnum(fid);
        if (fsp) {
                chain_fsp = fsp;
        }
@@ -548,9 +528,6 @@ NTSTATUS dup_file_fsp(files_struct *fsp,
        dup_fsp->open_time = fsp->open_time;
        dup_fsp->access_mask = access_mask;
        dup_fsp->share_access = share_access;
-       dup_fsp->pending_modtime_owner = fsp->pending_modtime_owner;
-       dup_fsp->pending_modtime = fsp->pending_modtime;
-       dup_fsp->last_write_time = fsp->last_write_time;
        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;
@@ -562,7 +539,7 @@ NTSTATUS dup_file_fsp(files_struct *fsp,
        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;