Attachment 298048 Details for Bug 433249 – Patch rediffed for RHEL4 (55.0.12)

[patch] Patch rediffed for RHEL4 (55.0.12)

nfs_access_cache_shrinker-race.el4.patch (text/plain), 1006 bytes, created by Bryn M. Reeves on 2008-03-14 13:49:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Bryn M. Reeves

Created: 2008-03-14 13:49:24 UTC

Size: 1006 bytes

patch

obsolete

>diff -up linux-2.6.9/fs/nfs/dir.c.access_shrinker linux-2.6.9/fs/nfs/dir.c
>--- linux-2.6.9/fs/nfs/dir.c.access_shrinker	2008-03-14 12:59:32.000000000 +0000
>+++ linux-2.6.9/fs/nfs/dir.c	2008-03-14 13:00:39.000000000 +0000
>@@ -1698,13 +1698,19 @@ int nfs_access_cache_shrinker(int nr_to_
> 	spin_lock(&nfs_access_lru_lock);
> restart:
> 	list_for_each_entry(nfsi, &nfs_access_lru_list, access_cache_inode_lru) {
>+		struct rw_semaphore *s_umount;
> 		struct inode *inode;
> 
> 		if (nr_to_scan-- == 0)
> 			break;
>+		s_umount = &nfsi->vfs_inode.i_sb->s_umount;
>+		if (!down_read_trylock(s_umount))
>+			continue;
> 		inode = igrab(&nfsi->vfs_inode);
>-		if (inode == NULL)
>+		if (inode == NULL) {
>+			up_read(s_umount);
> 			continue;
>+		}
> 		spin_lock(&inode->i_lock);
> 		if (list_empty(&nfsi->access_cache_entry_lru))
> 			goto remove_lru_entry;
>@@ -1722,6 +1728,7 @@ remove_lru_entry:
> 		}
> 		spin_unlock(&inode->i_lock);
> 		iput(inode);
>+		up_read(s_umount);
> 		goto restart;
> 	}
> 	spin_unlock(&nfs_access_lru_lock);

Actions: View | Diff

Attachments on bug 433249: 296980 | 297966 | 298048 | 299221