fs: move fscrypt keyring destruction to after ->put_super

[linux-2.6-microblaze.git] / fs / super.c

diff --git a/fs/super.c b/fs/super.c
index 0763923..faf7d24 100644 (file)
--- a/fs/super.c
+++ b/fs/super.c
@@ -681,12 +681,6 @@ void generic_shutdown_super(struct super_block *sb)
                fsnotify_sb_delete(sb);
                security_sb_delete(sb);
 
-               /*
-                * Now that all potentially-encrypted inodes have been evicted,
-                * the fscrypt keyring can be destroyed.
-                */
-               fscrypt_destroy_keyring(sb);
-
                if (sb->s_dio_done_wq) {
                        destroy_workqueue(sb->s_dio_done_wq);
                        sb->s_dio_done_wq = NULL;
@@ -695,6 +689,12 @@ void generic_shutdown_super(struct super_block *sb)
                if (sop->put_super)
                        sop->put_super(sb);
 
+               /*
+                * Now that all potentially-encrypted inodes have been evicted,
+                * the fscrypt keyring can be destroyed.
+                */
+               fscrypt_destroy_keyring(sb);
+
                if (CHECK_DATA_CORRUPTION(!list_empty(&sb->s_inodes),
                                "VFS: Busy inodes after unmount of %s (%s)",
                                sb->s_id, sb->s_type->name)) {