Commit 91dee39e authored by Sage Weil's avatar Sage Weil

ceph: fix snap realm splits

The snap realm split was checking i_snap_realm, not the list_head, to
determine if an inode belonged in the new realm.  The check always failed,
which meant we always moved the inode, corrupting the old realm's list and
causing various crashes.

Also wait to release old realm reference to avoid possibility of use after
free.
Signed-off-by: default avatarSage Weil <sage@newdream.net>
parent c10f5e12
...@@ -869,16 +869,20 @@ skip_inode: ...@@ -869,16 +869,20 @@ skip_inode:
continue; continue;
ci = ceph_inode(inode); ci = ceph_inode(inode);
spin_lock(&inode->i_lock); spin_lock(&inode->i_lock);
if (!ci->i_snap_realm) if (list_empty(&ci->i_snap_realm_item)) {
goto split_skip_inode; struct ceph_snap_realm *oldrealm =
ceph_put_snap_realm(mdsc, ci->i_snap_realm); ci->i_snap_realm;
dout(" moving %p to split realm %llx %p\n",
inode, realm->ino, realm);
spin_lock(&realm->inodes_with_caps_lock); spin_lock(&realm->inodes_with_caps_lock);
list_add(&ci->i_snap_realm_item, list_add(&ci->i_snap_realm_item,
&realm->inodes_with_caps); &realm->inodes_with_caps);
ci->i_snap_realm = realm; ci->i_snap_realm = realm;
spin_unlock(&realm->inodes_with_caps_lock); spin_unlock(&realm->inodes_with_caps_lock);
ceph_get_snap_realm(mdsc, realm); ceph_get_snap_realm(mdsc, realm);
split_skip_inode: ceph_put_snap_realm(mdsc, oldrealm);
}
spin_unlock(&inode->i_lock); spin_unlock(&inode->i_lock);
iput(inode); iput(inode);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment