Attachment 292196 Details for Bug 427472 – Proposed patch

[patch] Proposed patch

427472.rhel-5 (text/plain), 3.27 KB, created by Peter Staubach on 2008-01-18 20:08:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Peter Staubach

Created: 2008-01-18 20:08:17 UTC

Size: 3.27 KB

patch

obsolete

>--- linux-2.6.18.i686/fs/nfs/dir.c.org
>+++ linux-2.6.18.i686/fs/nfs/dir.c
>@@ -1670,8 +1670,7 @@ out:
> 	if (rehash)
> 		d_rehash(rehash);
> 	if (!error) {
>-		if (!S_ISDIR(old_inode->i_mode))
>-			d_move(old_dentry, new_dentry);
>+		d_move(old_dentry, new_dentry);
> 		nfs_set_verifier(new_dentry, nfs_save_change_attribute(new_dir));
> 	}
> 
>--- linux-2.6.18.i686/fs/nfs/super.c.org
>+++ linux-2.6.18.i686/fs/nfs/super.c
>@@ -71,7 +71,7 @@ static struct file_system_type nfs_fs_ty
> 	.name		= "nfs",
> 	.get_sb		= nfs_get_sb,
> 	.kill_sb	= nfs_kill_super,
>-	.fs_flags	= FS_ODD_RENAME|FS_REVAL_DOT|FS_BINARY_MOUNTDATA,
>+	.fs_flags	= FS_RENAME_DOES_D_MOVE|FS_REVAL_DOT|FS_BINARY_MOUNTDATA,
> };
> 
> struct file_system_type nfs_xdev_fs_type = {
>@@ -79,7 +79,7 @@ struct file_system_type nfs_xdev_fs_type
> 	.name		= "nfs",
> 	.get_sb		= nfs_xdev_get_sb,
> 	.kill_sb	= nfs_kill_super,
>-	.fs_flags	= FS_ODD_RENAME|FS_REVAL_DOT|FS_BINARY_MOUNTDATA,
>+	.fs_flags	= FS_RENAME_DOES_D_MOVE|FS_REVAL_DOT|FS_BINARY_MOUNTDATA,
> };
> 
> static struct super_operations nfs_sops = {
>@@ -108,7 +108,7 @@ static struct file_system_type nfs4_fs_t
> 	.name		= "nfs4",
> 	.get_sb		= nfs4_get_sb,
> 	.kill_sb	= nfs4_kill_super,
>-	.fs_flags	= FS_ODD_RENAME|FS_REVAL_DOT|FS_BINARY_MOUNTDATA,
>+	.fs_flags	= FS_RENAME_DOES_D_MOVE|FS_REVAL_DOT|FS_BINARY_MOUNTDATA,
> };
> 
> struct file_system_type nfs4_xdev_fs_type = {
>@@ -116,7 +116,7 @@ struct file_system_type nfs4_xdev_fs_typ
> 	.name		= "nfs4",
> 	.get_sb		= nfs4_xdev_get_sb,
> 	.kill_sb	= nfs4_kill_super,
>-	.fs_flags	= FS_ODD_RENAME|FS_REVAL_DOT|FS_BINARY_MOUNTDATA,
>+	.fs_flags	= FS_RENAME_DOES_D_MOVE|FS_REVAL_DOT|FS_BINARY_MOUNTDATA,
> };
> 
> struct file_system_type nfs4_referral_fs_type = {
>@@ -124,7 +124,7 @@ struct file_system_type nfs4_referral_fs
> 	.name		= "nfs4",
> 	.get_sb		= nfs4_referral_get_sb,
> 	.kill_sb	= nfs4_kill_super,
>-	.fs_flags	= FS_ODD_RENAME|FS_REVAL_DOT|FS_BINARY_MOUNTDATA,
>+	.fs_flags	= FS_RENAME_DOES_D_MOVE|FS_REVAL_DOT|FS_BINARY_MOUNTDATA,
> };
> 
> static struct super_operations nfs4_sops = {
>--- linux-2.6.18.i686/fs/namei.c.org
>+++ linux-2.6.18.i686/fs/namei.c
>@@ -2397,7 +2397,8 @@ static int vfs_rename_dir(struct inode *
> 		dput(new_dentry);
> 	}
> 	if (!error)
>-		d_move(old_dentry,new_dentry);
>+		if (!(old_dir->i_sb->s_type->fs_flags & FS_RENAME_DOES_D_MOVE))
>+			d_move(old_dentry,new_dentry);
> 	return error;
> }
> 
>@@ -2420,8 +2421,7 @@ static int vfs_rename_other(struct inode
> 	else
> 		error = old_dir->i_op->rename(old_dir, old_dentry, new_dir, new_dentry);
> 	if (!error) {
>-		/* The following d_move() should become unconditional */
>-		if (!(old_dir->i_sb->s_type->fs_flags & FS_ODD_RENAME))
>+		if (!(old_dir->i_sb->s_type->fs_flags & FS_RENAME_DOES_D_MOVE))
> 			d_move(old_dentry, new_dentry);
> 	}
> 	if (target)
>--- linux-2.6.18.i686/include/linux/fs.h.org
>+++ linux-2.6.18.i686/include/linux/fs.h
>@@ -92,9 +92,10 @@ extern int dir_notify_enable;
> #define FS_REQUIRES_DEV 1 
> #define FS_BINARY_MOUNTDATA 2
> #define FS_REVAL_DOT	16384	/* Check the paths ".", ".." for staleness */
>-#define FS_ODD_RENAME	32768	/* Temporary stuff; will go away as soon
>-				  * as nfs_rename() will be cleaned up
>-				  */
>+#define FS_RENAME_DOES_D_MOVE	32768	/* FS will handle d_move()
>+					 * during rename() internally.
>+					 */
>+
> /*
>  * These are the fs-independent mount-flags: up to 32 flags are supported
>  */

Actions: View | Diff

Attachments on bug 427472: 290811 | 292196