Merge tag 'jfs-5.14' of git://github.com/kleikamp/linux-shaggy

Pull jfs updates from David Kleikamp:
 "JFS fixes for 5.14"

* tag 'jfs-5.14' of git://github.com/kleikamp/linux-shaggy:
  jfs: Avoid field-overflowing memcpy()
  jfs: remove unnecessary oom message
  jfs: fix GPF in diFree
  fs/jfs: Fix missing error code in lmLogInit()
  jfs: Remove trailing semicolon in macros
  fs: Fix typo issue

diff --combined fs/jfs/inode.c
index 3663dd5a23bc832cdce8af6538dafe69d6e4c5e8,b0eb9c85eea0c45480082328b1b142884005b097..57ab424c05ff02a198328ecdd62da906b03fc02e
--- 1/fs/jfs/inode.c
--- 2/fs/jfs/inode.c
+++ b/fs/jfs/inode.c
@@@ -151,7 -151,8 +151,8 @@@ void jfs_evict_inode(struct inode *inod
                        if (test_cflag(COMMIT_Freewmap, inode))
                                jfs_free_zero_link(inode);
  
-                       diFree(inode);
+                       if (JFS_SBI(inode->i_sb)->ipimap)
+                               diFree(inode);
  
                        /*
                         * Free the inode from the quota allocation.
@@@ -356,7 -357,6 +357,7 @@@ static ssize_t jfs_direct_IO(struct kio
  }
  
  const struct address_space_operations jfs_aops = {
 +      .set_page_dirty = __set_page_dirty_buffers,
        .readpage       = jfs_readpage,
        .readahead      = jfs_readahead,
        .writepage      = jfs_writepage,