2 files changed, 4 insertions, 3 deletions

diff --git a/fs/afs/cell.c b/fs/afs/cell.c
index 69b95faacc5e..721425b98b31 100644
--- a/fs/afs/cell.c
+++ b/fs/afs/cell.c
@@ -334,8 +334,8 @@ int afs_cell_init(struct afs_net *net, const char *rootcell)
                 return PTR_ERR(new_root);
         }
 
-        set_bit(AFS_CELL_FL_NO_GC, &new_root->flags);
-        afs_get_cell(new_root);
+        if (!test_and_set_bit(AFS_CELL_FL_NO_GC, &new_root->flags))
+                afs_get_cell(new_root);
 
         /* install the new cell */
         write_seqlock(&net->cells_lock);
diff --git a/fs/afs/proc.c b/fs/afs/proc.c
index 1c95756335b7..2f04d37eeef0 100644
--- a/fs/afs/proc.c
+++ b/fs/afs/proc.c
@@ -284,7 +284,8 @@ static ssize_t afs_proc_cells_write(struct file *file, const char __user *buf,
                         goto done;
                 }
 
-                set_bit(AFS_CELL_FL_NO_GC, &cell->flags);
+                if (test_and_set_bit(AFS_CELL_FL_NO_GC, &cell->flags))
+                        afs_put_cell(net, cell);
                 printk("kAFS: Added new cell '%s'\n", name);
         } else {
                 goto inval;