diff options
| author | Sage Weil <sage@newdream.net> | 2010-03-09 12:59:08 -0800 |
|---|---|---|
| committer | Sage Weil <sage@newdream.net> | 2010-03-20 21:33:08 -0700 |
| commit | 8b218b8a4a65bf4e304ae8690cadb9100ef029c0 (patch) | |
| tree | 0fcc54e0bfff4cea6bdbb73c391adc9763564a6b /fs | |
| parent | 052bb34af3bf8ae2001b9f03d884ba0def3e427c (diff) | |
| download | op-kernel-dev-8b218b8a4a65bf4e304ae8690cadb9100ef029c0.zip op-kernel-dev-8b218b8a4a65bf4e304ae8690cadb9100ef029c0.tar.gz | |
ceph: fix inode removal from snap realm when racing with migration
When an inode was dropped while being migrated between two MDSs,
i_cap_exporting_issued was non-zero such that issue caps were non-zero and
__ceph_is_any_caps(ci) was true. This prevented the inode from being
removed from the snap realm, even as it was dropped from the cache.
Fix this by dropping any residual i_snap_realm ref in destroy_inode.
Signed-off-by: Sage Weil <sage@newdream.net>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/ceph/inode.c | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/fs/ceph/inode.c b/fs/ceph/inode.c index 7abe1ae..aca82d5 100644 --- a/fs/ceph/inode.c +++ b/fs/ceph/inode.c @@ -378,6 +378,22 @@ void ceph_destroy_inode(struct inode *inode) ceph_queue_caps_release(inode); + /* + * we may still have a snap_realm reference if there are stray + * caps in i_cap_exporting_issued or i_snap_caps. + */ + if (ci->i_snap_realm) { + struct ceph_mds_client *mdsc = + &ceph_client(ci->vfs_inode.i_sb)->mdsc; + struct ceph_snap_realm *realm = ci->i_snap_realm; + + dout(" dropping residual ref to snap realm %p\n", realm); + spin_lock(&realm->inodes_with_caps_lock); + list_del_init(&ci->i_snap_realm_item); + spin_unlock(&realm->inodes_with_caps_lock); + ceph_put_snap_realm(mdsc, realm); + } + kfree(ci->i_symlink); while ((n = rb_first(&ci->i_fragtree)) != NULL) { frag = rb_entry(n, struct ceph_inode_frag, node); |
