patch-2.4.0-test3 linux/fs/hpfs/namei.c

• Lines: 39
• Date: Wed Jul 5 11:31:01 2000
• Orig file: v2.4.0-test2/linux/fs/hpfs/namei.c
• Orig date: Tue May 23 15:31:36 2000

diff -u --recursive --new-file v2.4.0-test2/linux/fs/hpfs/namei.c linux/fs/hpfs/namei.c
@@ -330,7 +330,15 @@
 		struct iattr newattrs;
 		int err;
 		hpfs_unlock_2inodes(dir, inode);
-		if (rep || dentry->d_count > 1 || permission(inode, MAY_WRITE) || get_write_access(inode)) goto ret;
+		if (rep)
+			goto ret;
+		d_drop(dentry);
+		if (atomic_read(&dentry->d_count) > 1 ||
+		    permission(inode, MAY_WRITE) ||
+		    get_write_access(inode)) {
+			d_rehash(dentry);
+			goto ret;
+		}
 		/*printk("HPFS: truncating file before delete.\n");*/
 		down(&inode->i_sem);
 		newattrs.ia_size = 0;
@@ -400,18 +408,21 @@
 	int err;
 
 	err = -EIO;
+	lock_kernel();
 	if (!(fnode = hpfs_map_fnode(i->i_sb, i->i_ino, &bh)))
 		goto fail;
 	err = hpfs_read_ea(i->i_sb, fnode, "SYMLINK", link, PAGE_SIZE);
 	brelse(bh);
 	if (err)
 		goto fail;
+	unlock_kernel();
 	SetPageUptodate(page);
 	kunmap(page);
 	UnlockPage(page);
 	return 0;
 
 fail:
+	unlock_kernel();
 	SetPageError(page);
 	kunmap(page);
 	UnlockPage(page);