diff options
author | Miklos Szeredi <mszeredi@redhat.com> | 2016-09-27 05:03:58 -0400 |
---|---|---|
committer | Miklos Szeredi <mszeredi@redhat.com> | 2016-09-27 05:03:58 -0400 |
commit | 1cd66c93ba8cdb873258f58ae6a817b28a02bcc3 (patch) | |
tree | f9a1f49b000c9959c5b278eae175b996ade3a7cd /fs/9p/vfs_inode.c | |
parent | e0e0be8a835520e2f7c89f214dfda570922a1b90 (diff) |
fs: make remaining filesystems use .rename2
This is trivial to do:
- add flags argument to foo_rename()
- check if flags is zero
- assign foo_rename() to .rename2 instead of .rename
This doesn't mean it's impossible to support RENAME_NOREPLACE for these
filesystems, but it is not trivial, like for local filesystems.
RENAME_NOREPLACE must guarantee atomicity (i.e. it shouldn't be possible
for a file to be created on one host while it is overwritten by rename on
another host).
Filesystems converted:
9p, afs, ceph, coda, ecryptfs, kernfs, lustre, ncpfs, nfs, ocfs2, orangefs.
After this, we can get rid of the duplicate interfaces for rename.
Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Acked-by: David Howells <dhowells@redhat.com> [AFS]
Acked-by: Mike Marshall <hubcap@omnibond.com>
Cc: Eric Van Hensbergen <ericvh@gmail.com>
Cc: Ilya Dryomov <idryomov@gmail.com>
Cc: Jan Harkes <jaharkes@cs.cmu.edu>
Cc: Tyler Hicks <tyhicks@canonical.com>
Cc: Oleg Drokin <oleg.drokin@intel.com>
Cc: Trond Myklebust <trond.myklebust@primarydata.com>
Cc: Mark Fasheh <mfasheh@suse.com>
Diffstat (limited to 'fs/9p/vfs_inode.c')
-rw-r--r-- | fs/9p/vfs_inode.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/fs/9p/vfs_inode.c b/fs/9p/vfs_inode.c index 8b1999b528e9..50ab1a615207 100644 --- a/fs/9p/vfs_inode.c +++ b/fs/9p/vfs_inode.c | |||
@@ -955,7 +955,8 @@ int v9fs_vfs_rmdir(struct inode *i, struct dentry *d) | |||
955 | 955 | ||
956 | int | 956 | int |
957 | v9fs_vfs_rename(struct inode *old_dir, struct dentry *old_dentry, | 957 | v9fs_vfs_rename(struct inode *old_dir, struct dentry *old_dentry, |
958 | struct inode *new_dir, struct dentry *new_dentry) | 958 | struct inode *new_dir, struct dentry *new_dentry, |
959 | unsigned int flags) | ||
959 | { | 960 | { |
960 | int retval; | 961 | int retval; |
961 | struct inode *old_inode; | 962 | struct inode *old_inode; |
@@ -966,6 +967,9 @@ v9fs_vfs_rename(struct inode *old_dir, struct dentry *old_dentry, | |||
966 | struct p9_fid *newdirfid; | 967 | struct p9_fid *newdirfid; |
967 | struct p9_wstat wstat; | 968 | struct p9_wstat wstat; |
968 | 969 | ||
970 | if (flags) | ||
971 | return -EINVAL; | ||
972 | |||
969 | p9_debug(P9_DEBUG_VFS, "\n"); | 973 | p9_debug(P9_DEBUG_VFS, "\n"); |
970 | retval = 0; | 974 | retval = 0; |
971 | old_inode = d_inode(old_dentry); | 975 | old_inode = d_inode(old_dentry); |
@@ -1436,7 +1440,7 @@ static const struct inode_operations v9fs_dir_inode_operations_dotu = { | |||
1436 | .mkdir = v9fs_vfs_mkdir, | 1440 | .mkdir = v9fs_vfs_mkdir, |
1437 | .rmdir = v9fs_vfs_rmdir, | 1441 | .rmdir = v9fs_vfs_rmdir, |
1438 | .mknod = v9fs_vfs_mknod, | 1442 | .mknod = v9fs_vfs_mknod, |
1439 | .rename = v9fs_vfs_rename, | 1443 | .rename2 = v9fs_vfs_rename, |
1440 | .getattr = v9fs_vfs_getattr, | 1444 | .getattr = v9fs_vfs_getattr, |
1441 | .setattr = v9fs_vfs_setattr, | 1445 | .setattr = v9fs_vfs_setattr, |
1442 | }; | 1446 | }; |
@@ -1449,7 +1453,7 @@ static const struct inode_operations v9fs_dir_inode_operations = { | |||
1449 | .mkdir = v9fs_vfs_mkdir, | 1453 | .mkdir = v9fs_vfs_mkdir, |
1450 | .rmdir = v9fs_vfs_rmdir, | 1454 | .rmdir = v9fs_vfs_rmdir, |
1451 | .mknod = v9fs_vfs_mknod, | 1455 | .mknod = v9fs_vfs_mknod, |
1452 | .rename = v9fs_vfs_rename, | 1456 | .rename2 = v9fs_vfs_rename, |
1453 | .getattr = v9fs_vfs_getattr, | 1457 | .getattr = v9fs_vfs_getattr, |
1454 | .setattr = v9fs_vfs_setattr, | 1458 | .setattr = v9fs_vfs_setattr, |
1455 | }; | 1459 | }; |