diff options
author | Sage Weil <sage@newdream.net> | 2011-11-30 09:47:09 -0800 |
---|---|---|
committer | Sage Weil <sage@newdream.net> | 2011-12-07 10:46:44 -0800 |
commit | be655596b3de5873f994ddbe205751a5ffb4de39 (patch) | |
tree | cf6e53c6344f87a47ac68d6a6ff4d7dac6e5c25e /fs/ceph/mds_client.h | |
parent | 51703306b3b9ea7c05728040998521e47358147b (diff) | |
download | linux-be655596b3de5873f994ddbe205751a5ffb4de39.tar.gz linux-be655596b3de5873f994ddbe205751a5ffb4de39.tar.bz2 linux-be655596b3de5873f994ddbe205751a5ffb4de39.zip |
ceph: use i_ceph_lock instead of i_lock
We have been using i_lock to protect all kinds of data structures in the
ceph_inode_info struct, including lists of inodes that we need to iterate
over while avoiding races with inode destruction. That requires grabbing
a reference to the inode with the list lock protected, but igrab() now
takes i_lock to check the inode flags.
Changing the list lock ordering would be a painful process.
However, using a ceph-specific i_ceph_lock in the ceph inode instead of
i_lock is a simple mechanical change and avoids the ordering constraints
imposed by igrab().
Reported-by: Amon Ott <a.ott@m-privacy.de>
Signed-off-by: Sage Weil <sage@newdream.net>
Diffstat (limited to 'fs/ceph/mds_client.h')
-rw-r--r-- | fs/ceph/mds_client.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ceph/mds_client.h b/fs/ceph/mds_client.h index 4bb239921dbd..a50ca0e39475 100644 --- a/fs/ceph/mds_client.h +++ b/fs/ceph/mds_client.h @@ -20,7 +20,7 @@ * * mdsc->snap_rwsem * - * inode->i_lock + * ci->i_ceph_lock * mdsc->snap_flush_lock * mdsc->cap_delay_lock * |