fscrypt: Use correct index in decrypt path.

Actually use the fs-provided index instead of always using page->index
which is only set for page-cache pages.

Fixes: 9c4bb8a3a9b4 ("fscrypt: Let fs select encryption index/tweak")

Signed-off-by: David Gstir <david@sigma-star.at>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>

diff --git a/fs/crypto/crypto.c b/fs/crypto/crypto.c
index 4d9d221b1d606fb2952e7fc2c22b810b2c8a0e99..d19a42f3a983622c4a045dde98d2953c76f8bbc7 100644 (file)
--- a/fs/crypto/crypto.c
+++ b/fs/crypto/crypto.c
@@ -296,7 +296,7 @@ EXPORT_SYMBOL(fscrypt_encrypt_page);
 int fscrypt_decrypt_page(const struct inode *inode, struct page *page,
                        unsigned int len, unsigned int offs, pgoff_t index)
 {
-       return do_page_crypto(inode, FS_DECRYPT, page->index, page, page, len, offs,
+       return do_page_crypto(inode, FS_DECRYPT, index, page, page, len, offs,
                        GFP_NOFS);
 }
 EXPORT_SYMBOL(fscrypt_decrypt_page);