[PATCH 1/2 linux-next] fs/affs: add rename2 to prepare multiple methods

[Fabian Frederick]

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 
---
 fs/affs/affs.h  |  2 +-
 fs/affs/dir.c   |  2 +-
 fs/affs/namei.c | 25 -
 3 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/fs/affs/affs.h b/fs/affs/affs.h
index ba26a31..773749b 100644
--- a/fs/affs/affs.h
+++ b/fs/affs/affs.h
@@ -173,7 +173,7 @@ extern int  affs_link(struct dentry *olddentry, struct 
inode *dir,
  struct dentry *dentry);
 extern int affs_symlink(struct inode *dir, struct dentry *dentry,
 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,
unsigned int flags);
 
diff --git a/fs/affs/dir.c b/fs/affs/dir.c
index f1e7294..591ecd7 100644
--- a/fs/affs/dir.c
+++ b/fs/affs/dir.c
@@ -35,7 +35,7 @@ const struct inode_operations affs_dir_inode_operations = {
.symlink= affs_symlink,
.mkdir  = affs_mkdir,
.rmdir  = affs_rmdir,
-   .rename = affs_rename,
+   .rename = affs_rename2,
.setattr= affs_notify_change,
 };
 
diff --git a/fs/affs/namei.c b/fs/affs/namei.c
index d9a40b5..49a8dc1 100644
--- a/fs/affs/namei.c
+++ b/fs/affs/namei.c
@@ -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);
 }
 
-int
+static int
 affs_rename(struct inode *old_dir, struct dentry *old_dentry,
-   struct inode *new_dir, struct dentry *new_dentry,
-   unsigned int flags)
+   struct inode *new_dir, struct dentry *new_dentry)
 {
struct super_block *sb = old_dir->i_sb;
struct buffer_head *bh = NULL;
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,
 new_dentry->d_name.len,
 affs_nofilenametruncate(old_dentry));
@@ -448,6 +441,20 @@ affs_rename(struct inode *old_dir, struct dentry 
*old_dentry,
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)
 {
struct inode *parent;
-- 
2.9.3

[PATCH 1/2 linux-next] fs/affs: add rename2 to prepare multiple methods

[Fabian Frederick]

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 
---
 fs/affs/affs.h  |  2 +-
 fs/affs/dir.c   |  2 +-
 fs/affs/namei.c | 25 -
 3 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/fs/affs/affs.h b/fs/affs/affs.h
index ba26a31..773749b 100644
--- a/fs/affs/affs.h
+++ b/fs/affs/affs.h
@@ -173,7 +173,7 @@ extern int  affs_link(struct dentry *olddentry, struct 
inode *dir,
  struct dentry *dentry);
 extern int affs_symlink(struct inode *dir, struct dentry *dentry,
 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,
unsigned int flags);
 
diff --git a/fs/affs/dir.c b/fs/affs/dir.c
index f1e7294..591ecd7 100644
--- a/fs/affs/dir.c
+++ b/fs/affs/dir.c
@@ -35,7 +35,7 @@ const struct inode_operations affs_dir_inode_operations = {
.symlink= affs_symlink,
.mkdir  = affs_mkdir,
.rmdir  = affs_rmdir,
-   .rename = affs_rename,
+   .rename = affs_rename2,
.setattr= affs_notify_change,
 };
 
diff --git a/fs/affs/namei.c b/fs/affs/namei.c
index d9a40b5..49a8dc1 100644
--- a/fs/affs/namei.c
+++ b/fs/affs/namei.c
@@ -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);
 }
 
-int
+static int
 affs_rename(struct inode *old_dir, struct dentry *old_dentry,
-   struct inode *new_dir, struct dentry *new_dentry,
-   unsigned int flags)
+   struct inode *new_dir, struct dentry *new_dentry)
 {
struct super_block *sb = old_dir->i_sb;
struct buffer_head *bh = NULL;
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,
 new_dentry->d_name.len,
 affs_nofilenametruncate(old_dentry));
@@ -448,6 +441,20 @@ affs_rename(struct inode *old_dir, struct dentry 
*old_dentry,
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)
 {
struct inode *parent;
-- 
2.9.3