| Message ID | 152296018868.31027.18115871123610925864.stgit@warthog.procyon.org.uk (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hi,
[This is an automated email]
This commit has been processed by the -stable helper bot and determined
to be a high probability candidate for -stable trees. (score: 5.1905)
The bot has tested the following trees: v4.16.1, v4.15.16, v4.14.33, v4.9.93, v4.4.127.
v4.16.1: Build OK!
v4.15.16: Build OK!
v4.14.33: Failed to apply! Possible dependencies:
989782dcdc91 ("afs: Overhaul cell database management")
v4.9.93: Failed to apply! Possible dependencies:
989782dcdc91 ("afs: Overhaul cell database management")
v4.4.127: Failed to apply! Possible dependencies:
989782dcdc91 ("afs: Overhaul cell database management")
Please let us know if you'd like to have this patch included in a stable tree.
--
Thanks,
Sasha
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;
AFS cells that are added or set as the workstation cell through /proc are pinned against removal by setting the AFS_CELL_FL_NO_GC flag on them and taking a ref. The ref should be only taken if the flag wasn't already set. Fix this by making it conditional. Without this an assertion failure will occur during module removal indicating that the refcount is too elevated. Signed-off-by: David Howells <dhowells@redhat.com> --- fs/afs/cell.c | 4 ++-- fs/afs/proc.c | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-)