Attachment 157492 Details for Bug 228801 – Patch that changes how NFS dentries are validated

[patch] Patch that changes how NFS dentries are validated

linux-2.6.9-nfs-jiffy-wrap-fixes.patch (text/plain), 4.86 KB, created by Fabio Olive Leite on 2007-06-20 19:47:47 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Fabio Olive Leite

Created: 2007-06-20 19:47:47 UTC

Size: 4.86 KB

patch

obsolete

>diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c
>index 405698d..f5bf2a7 100644
>--- a/fs/nfs/dir.c
>+++ b/fs/nfs/dir.c
>@@ -611,12 +611,17 @@ int nfs_fsync_dir(struct file *filp, struct dentry *dentry, int datasync)
>  */
> static inline int nfs_check_verifier(struct inode *dir, struct dentry *dentry)
> {
>+	unsigned long verf;
>+
> 	if (IS_ROOT(dentry))
> 		return 1;
>+	verf = (unsigned long)dentry->d_fsdata;
> 	if ((NFS_I(dir)->cache_validity & NFS_INO_INVALID_ATTR) != 0
>-			|| nfs_attribute_timeout(dir))
>+			|| nfs_attribute_timeout(dir)
>+			|| nfs_caches_unstable(dir)
>+			|| verf != NFS_I(dir)->cache_change_attribute)
> 		return 0;
>-	return nfs_verify_change_attribute(dir, (unsigned long)dentry->d_fsdata);
>+	return 1;
> }
> 
> static inline void nfs_set_verifier(struct dentry * dentry, unsigned long verf)
>@@ -853,9 +858,15 @@ static struct dentry *nfs_lookup(struct inode *dir, struct dentry * dentry, stru
> 	if (error < 0)
> 		goto out_unlock;
> 
>-	/* If we're doing an exclusive create, optimize away the lookup */
>-	if (nfs_is_exclusive_create(dir, nd))
>-		goto no_entry;
>+	/*
>+	 * If we're doing an exclusive create, optimize away the lookup
>+	 * but don't hash the dentry.
>+	 */
>+	if (nfs_is_exclusive_create(dir, nd)) {
>+		d_instantiate(dentry, NULL);
>+		error = PTR_ERR(NULL);
>+		goto out_unlock;
>+	}
> 
> 	error = nfs_cached_lookup(dir, dentry, &fhandle, &fattr);
> 	if (error != 0) {
>@@ -1174,6 +1185,8 @@ int nfs_instantiate(struct dentry *dentry, struct nfs_fh *fhandle,
> 	if (inode == NULL)
> 		goto out_err;
> 	d_instantiate(dentry, inode);
>+	if (d_unhashed(dentry))
>+		d_rehash(dentry);
> 	return 0;
> out_err:
> 	d_drop(dentry);
>diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c
>index 6d190f8..8cf1103 100644
>--- a/fs/nfs/inode.c
>+++ b/fs/nfs/inode.c
>@@ -1318,6 +1318,7 @@ static int nfs_update_inode(struct inode *inode, struct nfs_fattr *fattr)
> 	struct nfs_inode *nfsi = NFS_I(inode);
> 	loff_t cur_isize, new_isize;
> 	unsigned int	invalid = 0;
>+	unsigned long now = jiffies;
> 	int data_stable;
> 
> 	dfprintk(VFS, "NFS: %s(%s/%ld ct=%d info=0x%x)\n",
>@@ -1346,7 +1347,11 @@ static int nfs_update_inode(struct inode *inode, struct nfs_fattr *fattr)
> 	 * Update the read time so we don't revalidate too often.
> 	 */
> 	nfsi->read_cache_jiffies = fattr->time_start;
>-	nfsi->last_updated = jiffies;
>+	nfsi->last_updated = now;
>+
>+	/* Fix a wraparound issue with nfsi->cache_change_attribute */
>+	if (time_before(now, nfsi->cache_change_attribute))
>+		nfsi->cache_change_attribute = now - 600*HZ;
> 
> 	/* Are we racing with known updates of the metadata on the server? */
> 	data_stable = nfs_verify_change_attribute(inode, fattr->time_start);
>@@ -1372,7 +1377,7 @@ static int nfs_update_inode(struct inode *inode, struct nfs_fattr *fattr)
> 			inode->i_size = new_isize;
> 			invalid |= NFS_INO_INVALID_ATTR|NFS_INO_INVALID_DATA;
> 		}
>-		nfsi->cache_change_attribute = jiffies;
>+		nfsi->cache_change_attribute = now;
> 		dprintk("NFS: isize change on server for file %s/%ld\n",
> 				inode->i_sb->s_id, inode->i_ino);
> 	}
>@@ -1383,14 +1388,14 @@ static int nfs_update_inode(struct inode *inode, struct nfs_fattr *fattr)
> 		dprintk("NFS: mtime change on server for file %s/%ld\n",
> 				inode->i_sb->s_id, inode->i_ino);
> 		invalid |= NFS_INO_INVALID_ATTR|NFS_INO_INVALID_DATA;
>-		nfsi->cache_change_attribute = jiffies;
>+		nfsi->cache_change_attribute = now;
> 	}
> 
> 	/* If ctime has changed we should definitely clear access+acl caches */
> 	if (!timespec_equal(&inode->i_ctime, &fattr->ctime)) {
> 		invalid |= NFS_INO_INVALID_ACCESS|NFS_INO_INVALID_ACL;
> 		memcpy(&inode->i_ctime, &fattr->ctime, sizeof(inode->i_ctime));
>-		nfsi->cache_change_attribute = jiffies;
>+		nfsi->cache_change_attribute = now;
> 	}
> 	memcpy(&inode->i_atime, &fattr->atime, sizeof(inode->i_atime));
> 
>@@ -1421,7 +1426,7 @@ static int nfs_update_inode(struct inode *inode, struct nfs_fattr *fattr)
> 					inode->i_sb->s_id, inode->i_ino);
> 			nfsi->change_attr = fattr->change_attr;
> 			invalid |= NFS_INO_INVALID_ATTR|NFS_INO_INVALID_DATA|NFS_INO_INVALID_ACCESS|NFS_INO_INVALID_ACL;
>-			nfsi->cache_change_attribute = jiffies;
>+			nfsi->cache_change_attribute = now;
> 		} else
> 			invalid &= ~(NFS_INO_INVALID_ATTR|NFS_INO_INVALID_DATA);
> 	}
>@@ -1429,11 +1434,11 @@ static int nfs_update_inode(struct inode *inode, struct nfs_fattr *fattr)
> 	/* Update attrtimeo value if we're out of the unstable period */
> 	if (invalid & NFS_INO_INVALID_ATTR) {
> 		nfsi->attrtimeo = NFS_MINATTRTIMEO(inode);
>-		nfsi->attrtimeo_timestamp = jiffies;
>-	} else if (time_after(jiffies, nfsi->attrtimeo_timestamp+nfsi->attrtimeo)) {
>+		nfsi->attrtimeo_timestamp = now;
>+	} else if (time_after(now, nfsi->attrtimeo_timestamp+nfsi->attrtimeo)) {
> 		if ((nfsi->attrtimeo <<= 1) > NFS_MAXATTRTIMEO(inode))
> 			nfsi->attrtimeo = NFS_MAXATTRTIMEO(inode);
>-		nfsi->attrtimeo_timestamp = jiffies;
>+		nfsi->attrtimeo_timestamp = now;
> 	}
> 	/* Don't invalidate the data if we were to blame */
> 	if (!(S_ISREG(inode->i_mode) || S_ISDIR(inode->i_mode)

Actions: View | Diff

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