4 files changed, 14 insertions, 12 deletions

diff --git a/fs/afs/cell.c b/fs/afs/cell.c
index 970d38f30565..584bb0f9c36a 100644
--- a/fs/afs/cell.c
+++ b/fs/afs/cell.c
@@ -127,14 +127,21 @@ struct afs_cell *afs_cell_create(const char *name, char *vllist)
 
         _enter("%s,%s", name, vllist);
 
+        down_write(&afs_cells_sem);
+        read_lock(&afs_cells_lock);
+        list_for_each_entry(cell, &afs_cells, link) {
+                if (strcasecmp(cell->name, name) == 0)
+                        goto duplicate_name;
+        }
+        read_unlock(&afs_cells_lock);
+
         cell = afs_cell_alloc(name, vllist);
         if (IS_ERR(cell)) {
                 _leave(" = %ld", PTR_ERR(cell));
+                up_write(&afs_cells_sem);
                 return cell;
         }
 
-        down_write(&afs_cells_sem);
-
         /* add a proc directory for this cell */
         ret = afs_proc_cell_setup(cell);
         if (ret < 0)
@@ -167,6 +174,11 @@ error:
         kfree(cell);
         _leave(" = %d", ret);
         return ERR_PTR(ret);
+
+duplicate_name:
+        read_unlock(&afs_cells_lock);
+        up_write(&afs_cells_sem);
+        return ERR_PTR(-EEXIST);
 }
 
 /*
diff --git a/fs/afs/internal.h b/fs/afs/internal.h
index 5ca3625cd39e..9ba16edc0af2 100644
--- a/fs/afs/internal.h
+++ b/fs/afs/internal.h
@@ -573,7 +573,6 @@ extern const struct file_operations afs_mntpt_file_operations;
 
 extern int afs_mntpt_check_symlink(struct afs_vnode *, struct key *);
 extern void afs_mntpt_kill_timer(void);
-extern void afs_umount_begin(struct vfsmount *, int);
 
 /*
  * proc.c
diff --git a/fs/afs/mntpt.c b/fs/afs/mntpt.c
index a3510b8ba3e7..2f5503902c37 100644
--- a/fs/afs/mntpt.c
+++ b/fs/afs/mntpt.c
@@ -283,11 +283,3 @@ void afs_mntpt_kill_timer(void)
         cancel_delayed_work(&afs_mntpt_expiry_timer);
         flush_scheduled_work();
 }
-
-/*
- * begin unmount by attempting to remove all automounted mountpoints we added
- */
-void afs_umount_begin(struct vfsmount *vfsmnt, int flags)
-{
-        shrink_submounts(vfsmnt, &afs_vfsmounts);
-}
diff --git a/fs/afs/super.c b/fs/afs/super.c
index 36bbce45f44b..4b572b801d8d 100644
--- a/fs/afs/super.c
+++ b/fs/afs/super.c
@@ -50,7 +50,6 @@ static const struct super_operations afs_super_ops = {
         .write_inode    = afs_write_inode,
         .destroy_inode  = afs_destroy_inode,
         .clear_inode    = afs_clear_inode,
-        .umount_begin   = afs_umount_begin,
         .put_super      = afs_put_super,
         .show_options   = generic_show_options,
 };