Merge tag 'f2fs-for-v5.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeu...

[thirdparty/kernel/stable.git] / fs / f2fs / f2fs.h

diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
index 533fafca68f436300d4bab3f42c90f36cd658986..06b89a9862ab2bb42bea7a067a455d497fc73e51 100644 (file)
--- a/fs/f2fs/f2fs.h
+++ b/fs/f2fs/f2fs.h
@@ -1345,7 +1345,7 @@ struct f2fs_private_dio {
 
 #ifdef CONFIG_F2FS_FAULT_INJECTION
 #define f2fs_show_injection_info(type)                                 \
-       printk_ratelimited("%sF2FS-fs : inject %s in %s of %pF\n",      \
+       printk_ratelimited("%sF2FS-fs : inject %s in %s of %pS\n",      \
                KERN_INFO, f2fs_fault_name[type],                       \
                __func__, __builtin_return_address(0))
 static inline bool time_to_inject(struct f2fs_sb_info *sbi, int type)
@@ -1440,7 +1440,6 @@ static inline u32 __f2fs_crc32(struct f2fs_sb_info *sbi, u32 crc,
        BUG_ON(crypto_shash_descsize(sbi->s_chksum_driver) != sizeof(desc.ctx));
 
        desc.shash.tfm = sbi->s_chksum_driver;
-       desc.shash.flags = 0;
        *(u32 *)desc.ctx = crc;
 
        err = crypto_shash_update(&desc.shash, address, length);