diff options
| author |   Xiubo Li <xiubli@redhat.com> | 2024-04-09 08:56:03 +0800 |
|---|---|---|
| committer |   Ilya Dryomov <idryomov@gmail.com> | 2024-04-11 22:56:28 +0200 |
| commit | 17f8dc2db52185460f212052f3a692c1fdc167ba (patch) | |
| tree | 02b53d747a4748717cb65c430053d609133e935d /fs/ceph/mds_client.h | |
| parent | ceph: redirty page before returning AOP_WRITEPAGE_ACTIVATE (diff) | |
| download | wireguard-linux-17f8dc2db52185460f212052f3a692c1fdc167ba.tar.xz wireguard-linux-17f8dc2db52185460f212052f3a692c1fdc167ba.zip | |
ceph: switch to use cap_delay_lock for the unlink delay list
The same list item will be used in both cap_delay_list and
cap_unlink_delay_list, so it's buggy to use two different locks
to protect them.
Cc: stable@vger.kernel.org
Fixes: dbc347ef7f0c ("ceph: add ceph_cap_unlink_work to fire check_caps() immediately")
Link: https://lists.ceph.io/hyperkitty/list/ceph-users@ceph.io/thread/AODC76VXRAMXKLFDCTK4TKFDDPWUSCN5
Reported-by: Marc Ruhmann <ruhmann@luis.uni-hannover.de>
Signed-off-by: Xiubo Li <xiubli@redhat.com>
Reviewed-by: Ilya Dryomov <idryomov@gmail.com>
Tested-by: Marc Ruhmann <ruhmann@luis.uni-hannover.de>
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
Diffstat (limited to '')
| -rw-r--r-- | fs/ceph/mds_client.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/ceph/mds_client.h b/fs/ceph/mds_client.h index 03f8ff00874f..b88e80415224 100644 --- a/fs/ceph/mds_client.h +++ b/fs/ceph/mds_client.h @@ -461,9 +461,8 @@ struct ceph_mds_client { struct delayed_work delayed_work; /* delayed work */ unsigned long last_renew_caps; /* last time we renewed our caps */ struct list_head cap_delay_list; /* caps with delayed release */ - spinlock_t cap_delay_lock; /* protects cap_delay_list */ struct list_head cap_unlink_delay_list; /* caps with delayed release for unlink */ - spinlock_t cap_unlink_delay_lock; /* protects cap_unlink_delay_list */ + spinlock_t cap_delay_lock; /* protects cap_delay_list and cap_unlink_delay_list */ struct list_head snap_flush_list; /* cap_snaps ready to flush */ spinlock_t snap_flush_lock; |