patch-2.3.32 linux/fs/umsdos/ioctl.c

• Lines: 25
• Date: Thu Dec 9 13:22:22 1999
• Orig file: v2.3.31/linux/fs/umsdos/ioctl.c
• Orig date: Fri Sep 25 16:30:07 1998

diff -u --recursive --new-file v2.3.31/linux/fs/umsdos/ioctl.c linux/fs/umsdos/ioctl.c
@@ -217,14 +217,11 @@
 		 * 
 		 * Return 0 if success.
 		 */
-		extern struct inode_operations umsdos_rdir_inode_operations;
 
 		ret = umsdos_make_emd(dentry);
 Printk(("UMSDOS_ioctl_dir: INIT_EMD %s/%s, ret=%d\n",
 dentry->d_parent->d_name.name, dentry->d_name.name, ret));
-		dir->i_op = (ret == 0)
-		    ? &umsdos_dir_inode_operations
-		    : &umsdos_rdir_inode_operations;
+		umsdos_setup_dir (dentry);
 		goto out;
 	}
 
@@ -280,6 +277,8 @@
 old_dentry->d_parent->d_name.name, old_dentry->d_name.name,
 new_dentry->d_parent->d_name.name, new_dentry->d_name.name);
 			ret = msdos_rename (dir, old_dentry, dir, new_dentry);
+			d_drop(new_dentry);
+			d_drop(old_dentry);
 			dput(new_dentry);
 		}
 		dput(old_dentry);