Revert "UBUNTU: SAUCE: ceph: make sure all the files successfully put before unmounting"
BugLink: https://bugs.launchpad.net/bugs/2056616 This reverts commit 603b74b4176fdf6ab2fb83306136947296e7aeb4. Signed-off-by: John Cabaj <john.cabaj@canonical.com> Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
This commit is contained in:
+1
-5
@@ -249,11 +249,7 @@ void fscrypt_destroy_keyring(struct super_block *sb)
|
||||
* with ->mk_present. There should be no structural
|
||||
* refs beyond the one associated with the active ref.
|
||||
*/
|
||||
if (refcount_read(&mk->mk_active_refs) != 1) {
|
||||
printk("fscrypt_destroy_keyring: mk_active_refs = %d\n",
|
||||
refcount_read(&mk->mk_active_refs));
|
||||
WARN_ON_ONCE(refcount_read(&mk->mk_active_refs) != 1);
|
||||
}
|
||||
WARN_ON_ONCE(refcount_read(&mk->mk_active_refs) != 1);
|
||||
WARN_ON_ONCE(refcount_read(&mk->mk_struct_refs) != 1);
|
||||
WARN_ON_ONCE(!mk->mk_present);
|
||||
fscrypt_initiate_key_removal(sb, mk);
|
||||
|
||||
+1
-4
@@ -717,11 +717,8 @@ void evict_inodes(struct super_block *sb)
|
||||
again:
|
||||
spin_lock(&sb->s_inode_list_lock);
|
||||
list_for_each_entry_safe(inode, next, &sb->s_inodes, i_sb_list) {
|
||||
if (atomic_read(&inode->i_count)) {
|
||||
printk("evict_inodes inode %p, i_count = %d, was skipped!\n",
|
||||
inode, atomic_read(&inode->i_count));
|
||||
if (atomic_read(&inode->i_count))
|
||||
continue;
|
||||
}
|
||||
|
||||
spin_lock(&inode->i_lock);
|
||||
if (inode->i_state & (I_NEW | I_FREEING | I_WILL_FREE)) {
|
||||
|
||||
Reference in New Issue
Block a user