Attachment 148097 Details for Bug 228801 – Trond Myklebust's dentry pruning patches combined and ported to RHEL-4.

[patch] Trond Myklebust's dentry pruning patches combined and ported to RHEL-4.

linux-2.6.9-trond-nfs-dentry-fixes.patch (text/plain), 1.37 KB, created by Fabio Olive Leite on 2007-02-15 05:39:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Fabio Olive Leite

Created: 2007-02-15 05:39:00 UTC

Size: 1.37 KB

patch

obsolete

>--- linux-2.6.9/fs/nfs/dir.c.old_IT106473	2007-02-06 17:01:52.000000000 -0200
>+++ linux-2.6.9/fs/nfs/dir.c	2007-02-06 18:50:00.000000000 -0200
>@@ -1046,8 +1046,28 @@
> 	}
> 	name.hash = full_name_hash(name.name, name.len);
> 	dentry = d_lookup(parent, &name);
>-	if (dentry != NULL)
>-		return dentry;
>+	if (dentry != NULL) {
>+		/* Is this a positive dentry that matches the readdir info? */
>+		if (dentry->d_inode != NULL &&
>+				(NFS_FILEID(dentry->d_inode) == entry->ino ||
>+				d_mountpoint(dentry))) {
>+			if (!desc->plus || entry->fh->size == 0)
>+				return dentry;
>+			if (nfs_compare_fh(NFS_FH(dentry->d_inode),
>+						entry->fh) == 0)
>+				goto out_renew;
>+		}
>+		/* No, so d_drop to allow one to be created */
>+		/* But first, log some data about the dentry found */
>+		dfprintk(VFS, "%s: dropping stale %s dentry!\n",
>+			__FUNCTION__,
>+			(dentry->d_inode == NULL) ? "negative" : "positive");
>+		dfprintk(VFS, "  dentry: %lx name: %s\n", dentry, name.name);
>+		dfprintk(VFS, "  parent: %lx name: %s\n", parent,
>+			parent->d_name.name);
>+		d_drop(dentry);
>+		dput(dentry);
>+	}
> 	if (!desc->plus || !(entry->fattr->valid & NFS_ATTR_FATTR))
> 		return NULL;
> 	/* Note: caller is already holding the dir->i_sem! */
>@@ -1061,6 +1081,7 @@
> 		return NULL;
> 	}
> 	d_add(dentry, inode);
>+out_renew:
> 	nfs_renew_times(dentry);
> 	nfs_set_verifier(dentry, nfs_save_change_attribute(dir));
> 	return dentry;

Actions: View | Diff

Attachments on bug 228801: 148096 | 148097 | 148440 | 150805 | 157492 | 158367