Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 349457ccf2592c14bdf13b6706170ae2e94931b1

Authored by Mark Fasheh
1 parent 1390334b4c
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

[PATCH] Allow file systems to manually d_move() inside of ->rename() 

Some file systems want to manually d_move() the dentries involved in a
rename.  We can do this by making use of the FS_ODD_RENAME flag if we just
have nfs_rename() unconditionally do the d_move().  While there, we rename
the flag to be more descriptive.

OCFS2 uses this to protect that part of the rename operation with a cluster
lock.

Signed-off-by: Mark Fasheh <mark.fasheh@oracle.com>
Cc: Trond Myklebust <trond.myklebust@fys.uio.no>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Christoph Hellwig <hch@lst.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>

Showing 4 changed files with 13 additions and 13 deletions Side-by-side Diff

... ... @@ -2370,7 +2370,8 @@
2370 2370 dput(new_dentry);
2371 2371 }
2372 2372 if (!error)
2373   - d_move(old_dentry,new_dentry);
  2373 + if (!(old_dir->i_sb->s_type->fs_flags & FS_RENAME_DOES_D_MOVE))
  2374 + d_move(old_dentry,new_dentry);
2374 2375 return error;
2375 2376 }
2376 2377  
... ... @@ -2393,8 +2394,7 @@
2393 2394 else
2394 2395 error = old_dir->i_op->rename(old_dir, old_dentry, new_dir, new_dentry);
2395 2396 if (!error) {
2396   - /* The following d_move() should become unconditional */
2397   - if (!(old_dir->i_sb->s_type->fs_flags & FS_ODD_RENAME))
  2397 + if (!(old_dir->i_sb->s_type->fs_flags & FS_RENAME_DOES_D_MOVE))
2398 2398 d_move(old_dentry, new_dentry);
2399 2399 }
2400 2400 if (target)
... ... @@ -1669,8 +1669,7 @@
1669 1669 if (rehash)
1670 1670 d_rehash(rehash);
1671 1671 if (!error) {
1672   - if (!S_ISDIR(old_inode->i_mode))
1673   - d_move(old_dentry, new_dentry);
  1672 + d_move(old_dentry, new_dentry);
1674 1673 nfs_renew_times(new_dentry);
1675 1674 nfs_set_verifier(new_dentry, nfs_save_change_attribute(new_dir));
1676 1675 }
... ... @@ -71,7 +71,7 @@
71 71 .name = "nfs",
72 72 .get_sb = nfs_get_sb,
73 73 .kill_sb = nfs_kill_super,
74   - .fs_flags = FS_ODD_RENAME|FS_REVAL_DOT|FS_BINARY_MOUNTDATA,
  74 + .fs_flags = FS_RENAME_DOES_D_MOVE|FS_REVAL_DOT|FS_BINARY_MOUNTDATA,
75 75 };
76 76  
77 77 struct file_system_type nfs_xdev_fs_type = {
... ... @@ -79,7 +79,7 @@
79 79 .name = "nfs",
80 80 .get_sb = nfs_xdev_get_sb,
81 81 .kill_sb = nfs_kill_super,
82   - .fs_flags = FS_ODD_RENAME|FS_REVAL_DOT|FS_BINARY_MOUNTDATA,
  82 + .fs_flags = FS_RENAME_DOES_D_MOVE|FS_REVAL_DOT|FS_BINARY_MOUNTDATA,
83 83 };
84 84  
85 85 static struct super_operations nfs_sops = {
... ... @@ -107,7 +107,7 @@
107 107 .name = "nfs4",
108 108 .get_sb = nfs4_get_sb,
109 109 .kill_sb = nfs4_kill_super,
110   - .fs_flags = FS_ODD_RENAME|FS_REVAL_DOT|FS_BINARY_MOUNTDATA,
  110 + .fs_flags = FS_RENAME_DOES_D_MOVE|FS_REVAL_DOT|FS_BINARY_MOUNTDATA,
111 111 };
112 112  
113 113 struct file_system_type nfs4_xdev_fs_type = {
... ... @@ -115,7 +115,7 @@
115 115 .name = "nfs4",
116 116 .get_sb = nfs4_xdev_get_sb,
117 117 .kill_sb = nfs4_kill_super,
118   - .fs_flags = FS_ODD_RENAME|FS_REVAL_DOT|FS_BINARY_MOUNTDATA,
  118 + .fs_flags = FS_RENAME_DOES_D_MOVE|FS_REVAL_DOT|FS_BINARY_MOUNTDATA,
119 119 };
120 120  
121 121 struct file_system_type nfs4_referral_fs_type = {
... ... @@ -123,7 +123,7 @@
123 123 .name = "nfs4",
124 124 .get_sb = nfs4_referral_get_sb,
125 125 .kill_sb = nfs4_kill_super,
126   - .fs_flags = FS_ODD_RENAME|FS_REVAL_DOT|FS_BINARY_MOUNTDATA,
  126 + .fs_flags = FS_RENAME_DOES_D_MOVE|FS_REVAL_DOT|FS_BINARY_MOUNTDATA,
127 127 };
128 128  
129 129 static struct super_operations nfs4_sops = {
... ... @@ -92,9 +92,10 @@
92 92 #define FS_REQUIRES_DEV 1
93 93 #define FS_BINARY_MOUNTDATA 2
94 94 #define FS_REVAL_DOT 16384 /* Check the paths ".", ".." for staleness */
95   -#define FS_ODD_RENAME 32768 /* Temporary stuff; will go away as soon
96   - * as nfs_rename() will be cleaned up
97   - */
  95 +#define FS_RENAME_DOES_D_MOVE 32768 /* FS will handle d_move()
  96 + * during rename() internally.
  97 + */
  98 +
98 99 /*
99 100 * These are the fs-independent mount-flags: up to 32 flags are supported
100 101 */