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>
This commit is contained in:
@@ -36,7 +36,7 @@ static int ncp_unlink(struct inode *, struct dentry *);
|
||||
static int ncp_mkdir(struct inode *, struct dentry *, umode_t);
|
||||
static int ncp_rmdir(struct inode *, struct dentry *);
|
||||
static int ncp_rename(struct inode *, struct dentry *,
|
||||
struct inode *, struct dentry *);
|
||||
struct inode *, struct dentry *, unsigned int);
|
||||
static int ncp_mknod(struct inode * dir, struct dentry *dentry,
|
||||
umode_t mode, dev_t rdev);
|
||||
#if defined(CONFIG_NCPFS_EXTRAS) || defined(CONFIG_NCPFS_NFS_NS)
|
||||
@@ -65,7 +65,7 @@ const struct inode_operations ncp_dir_inode_operations =
|
||||
.mkdir = ncp_mkdir,
|
||||
.rmdir = ncp_rmdir,
|
||||
.mknod = ncp_mknod,
|
||||
.rename = ncp_rename,
|
||||
.rename2 = ncp_rename,
|
||||
.setattr = ncp_notify_change,
|
||||
};
|
||||
|
||||
@@ -1105,13 +1105,17 @@ static int ncp_unlink(struct inode *dir, struct dentry *dentry)
|
||||
}
|
||||
|
||||
static int ncp_rename(struct inode *old_dir, struct dentry *old_dentry,
|
||||
struct inode *new_dir, struct dentry *new_dentry)
|
||||
struct inode *new_dir, struct dentry *new_dentry,
|
||||
unsigned int flags)
|
||||
{
|
||||
struct ncp_server *server = NCP_SERVER(old_dir);
|
||||
int error;
|
||||
int old_len, new_len;
|
||||
__u8 __old_name[NCP_MAXPATHLEN + 1], __new_name[NCP_MAXPATHLEN + 1];
|
||||
|
||||
if (flags)
|
||||
return -EINVAL;
|
||||
|
||||
ncp_dbg(1, "%pd2 to %pd2\n", old_dentry, new_dentry);
|
||||
|
||||
ncp_age_dentry(server, old_dentry);
|
||||
|
Reference in New Issue
Block a user