OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fs/affs: add rename2 to prepare multiple methods 

Currently AFFS only supports RENAME_NOREPLACE.
This patch isolates that method to a static function to
prepare RENAME_EXCHANGE addition.

Signed-off-by: Fabian Frederick <fabf@skynet.be>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Fabian Frederick 2017-05-05 20:51:42 +02:00 committed by Al Viro
parent deccf497d8
commit c6184028a7
3 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fs/affs/affs.h
View File

@ -173,7 +173,7 @@ extern int affs_link(struct dentry *olddentry, struct inode *dir,
struct dentry *dentry); struct dentry *dentry);
extern int affs_symlink(struct inode *dir, struct dentry *dentry, extern int affs_symlink(struct inode *dir, struct dentry *dentry,
const char *symname); const char *symname);
extern int affs_rename(struct inode *old_dir, struct dentry *old_dentry, extern int affs_rename2(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); unsigned int flags);

2
fs/affs/dir.c
View File

@ -35,7 +35,7 @@ const struct inode_operations affs_dir_inode_operations = {
.symlink = affs_symlink, .symlink = affs_symlink,
.mkdir = affs_mkdir, .mkdir = affs_mkdir,
.rmdir = affs_rmdir, .rmdir = affs_rmdir,
.rename = affs_rename, .rename = affs_rename2,
.setattr = affs_notify_change, .setattr = affs_notify_change,
}; };

25
fs/affs/namei.c
View File

@ -394,21 +394,14 @@ affs_link(struct dentry *old_dentry, struct inode *dir, struct dentry *dentry)
return affs_add_entry(dir, inode, dentry, ST_LINKFILE); return affs_add_entry(dir, inode, dentry, ST_LINKFILE);
} }
int static int
affs_rename(struct inode *old_dir, struct dentry *old_dentry, affs_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 super_block *sb = old_dir->i_sb; struct super_block *sb = old_dir->i_sb;
struct buffer_head *bh = NULL; struct buffer_head *bh = NULL;
int retval; int retval;
if (flags & ~RENAME_NOREPLACE)
return -EINVAL;
pr_debug("%s(old=%lu,\"%pd\" to new=%lu,\"%pd\")\n", __func__,
old_dir->i_ino, old_dentry, new_dir->i_ino, new_dentry);
retval = affs_check_name(new_dentry->d_name.name, retval = affs_check_name(new_dentry->d_name.name,
new_dentry->d_name.len, new_dentry->d_name.len,
affs_nofilenametruncate(old_dentry)); affs_nofilenametruncate(old_dentry));
@ -448,6 +441,20 @@ done:
return retval; return retval;
} }
int affs_rename2(struct inode *old_dir, struct dentry *old_dentry,
struct inode *new_dir, struct dentry *new_dentry,
unsigned int flags)
{
if (flags & ~RENAME_NOREPLACE)
return -EINVAL;
pr_debug("%s(old=%lu,\"%pd\" to new=%lu,\"%pd\")\n", __func__,
old_dir->i_ino, old_dentry, new_dir->i_ino, new_dentry);
return affs_rename(old_dir, old_dentry, new_dir, new_dentry);
}
static struct dentry *affs_get_parent(struct dentry *child) static struct dentry *affs_get_parent(struct dentry *child)
{ {
struct inode *parent; struct inode *parent;