patch-2.0.19 linux/fs/smbfs/inode.c

• Lines: 69
• Date: Sun Sep 8 17:58:06 1996
• Orig file: v2.0.18/linux/fs/smbfs/inode.c
• Orig date: Wed Jun 5 13:22:48 1996

diff -u --recursive --new-file v2.0.18/linux/fs/smbfs/inode.c linux/fs/smbfs/inode.c
@@ -121,28 +121,37 @@
 static void
 smb_put_inode(struct inode *inode)
 {
-        struct smb_dirent *finfo = SMB_FINFO(inode);
+        struct smb_dirent *finfo  = SMB_FINFO(inode);
+	struct smb_server *server = SMB_SERVER(inode);
+	struct smb_inode_info *info = SMB_INOP(inode);
+
+	int opened        = finfo->opened;
+	int mtime         = finfo->mtime;
+	int file_id       = finfo->fileid;
+	int isdir         = S_ISDIR(inode->i_mode);
+	unsigned long ino = inode->i_ino;
 
-        if (finfo->opened != 0) {
+	/* Remove the inode before closing the file, because the close
+           will sleep. This hopefully removes a race condition. */
 
-                /* smb_proc_close wants mtime in finfo */
-                finfo->mtime = inode->i_mtime;
-                
-                if (smb_proc_close(SMB_SERVER(inode), finfo)) {
-                        /* We can't do anything but complain. */
-                        printk("smb_put_inode: could not close\n");
-                }
-        }
-        
-        smb_free_inode_info(SMB_INOP(inode));
+	clear_inode(inode);
+        smb_free_inode_info(info);
 
-        if (S_ISDIR(inode->i_mode)) {
+        if (isdir)
+	{
                 DDPRINTK("smb_put_inode: put directory %ld\n",
                          inode->i_ino);
-                smb_invalid_dir_cache(inode->i_ino);
+                smb_invalid_dir_cache(ino);
         }                
 
-	clear_inode(inode);
+        if (opened != 0)
+	{
+                if (smb_proc_close(server, file_id, mtime))
+		{
+                        /* We can't do anything but complain. */
+                        DPRINTK("smb_put_inode: could not close\n");
+                }
+        }
 }
 
 static void
@@ -151,6 +160,7 @@
         struct smb_server *server = &(SMB_SBP(sb)->s_server);
 
         smb_proc_disconnect(server);
+	smb_dont_catch_keepalive(server);
 	close_fp(server->sock_file);
 
 	lock_super(sb);
@@ -299,6 +309,7 @@
 
  fail:
 	filp->f_count -= 1; 
+	smb_dont_catch_keepalive(server);
         smb_kfree_s(SMB_SBP(sb), sizeof(struct smb_sb_info));
         return NULL;
 }