net/mlx5: Update error handler for UCTX and UMEM

[linux-2.6-microblaze.git] / mm / shmem.c

diff --git a/mm/shmem.c b/mm/shmem.c
index 23c91a8..f0eee4e 100644 (file)
--- a/mm/shmem.c
+++ b/mm/shmem.c
@@ -2960,28 +2960,6 @@ static int shmem_rmdir(struct inode *dir, struct dentry *dentry)
        return shmem_unlink(dir, dentry);
 }
 
-static int shmem_exchange(struct inode *old_dir, struct dentry *old_dentry, struct inode *new_dir, struct dentry *new_dentry)
-{
-       bool old_is_dir = d_is_dir(old_dentry);
-       bool new_is_dir = d_is_dir(new_dentry);
-
-       if (old_dir != new_dir && old_is_dir != new_is_dir) {
-               if (old_is_dir) {
-                       drop_nlink(old_dir);
-                       inc_nlink(new_dir);
-               } else {
-                       drop_nlink(new_dir);
-                       inc_nlink(old_dir);
-               }
-       }
-       old_dir->i_ctime = old_dir->i_mtime =
-       new_dir->i_ctime = new_dir->i_mtime =
-       d_inode(old_dentry)->i_ctime =
-       d_inode(new_dentry)->i_ctime = current_time(old_dir);
-
-       return 0;
-}
-
 static int shmem_whiteout(struct user_namespace *mnt_userns,
                          struct inode *old_dir, struct dentry *old_dentry)
 {
@@ -3027,7 +3005,7 @@ static int shmem_rename2(struct user_namespace *mnt_userns,
                return -EINVAL;
 
        if (flags & RENAME_EXCHANGE)
-               return shmem_exchange(old_dir, old_dentry, new_dir, new_dentry);
+               return simple_rename_exchange(old_dir, old_dentry, new_dir, new_dentry);
 
        if (!simple_empty(new_dentry))
                return -ENOTEMPTY;