Attachment 1621014 Details for Bug 1749390 – proposed patch to work around buggy iso images

[patch] proposed patch to work around buggy iso images

proposed2.patch (text/plain), 1.14 KB, created by Miklos Szeredi on 2019-09-30 08:58:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Miklos Szeredi

Created: 2019-09-30 08:58:02 UTC

Size: 1.14 KB

patch

obsolete

>diff --git a/fs/dcache.c b/fs/dcache.c
>index 0c3834c4e0e6..01b6cf10380c 100644
>--- a/fs/dcache.c
>+++ b/fs/dcache.c
>@@ -2833,34 +2833,7 @@ struct dentry *d_splice_alias(struct inode *inode, struct dentry *dentry)
> 		return ERR_CAST(inode);
> 
> 	if (inode && S_ISDIR(inode->i_mode)) {
>-		spin_lock(&inode->i_lock);
>-		new = __d_find_any_alias(inode);
>-		if (new) {
>-			if (!IS_ROOT(new)) {
>-				spin_unlock(&inode->i_lock);
>-				dput(new);
>-				return ERR_PTR(-EIO);
>-			}
>-			if (d_ancestor(new, dentry)) {
>-				spin_unlock(&inode->i_lock);
>-				dput(new);
>-				return ERR_PTR(-EIO);
>-			}
>-			write_seqlock(&rename_lock);
>-			__d_materialise_dentry(dentry, new);
>-			write_sequnlock(&rename_lock);
>-			_d_rehash(new);
>-			spin_unlock(&new->d_lock);
>-			spin_unlock(&inode->i_lock);
>-			security_d_instantiate(new, inode);
>-			iput(inode);
>-		} else {
>-			/* already taking inode->i_lock, so d_add() by hand */
>-			__d_instantiate(dentry, inode);
>-			spin_unlock(&inode->i_lock);
>-			security_d_instantiate(dentry, inode);
>-			d_rehash(dentry);
>-		}
>+		new = d_materialise_unique(dentry, inode);
> 	} else {
> 		d_instantiate(dentry, inode);
> 		if (d_unhashed(dentry))

Actions: View | Diff

Attachments on bug 1749390: 1618935 | 1621014