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

Pull jfs updates from David Kleikamp:
 "A couple small fixes for jfs"

* tag 'jfs-4.15' of git://github.com/kleikamp/linux-shaggy:
  jfs: Add missing NULL pointer check in __get_metapage
  jfs: remove increment of i_version counter

2 files changed, 2 insertions, 1 deletions

diff --git a/fs/jfs/jfs_metapage.c b/fs/jfs/jfs_metapage.c
index 1c4b9ad4d7ab..1a3b0cc22ad3 100644
--- a/fs/jfs/jfs_metapage.c
+++ b/fs/jfs/jfs_metapage.c
@@ -663,6 +663,8 @@ struct metapage *__get_metapage(struct inode *inode, unsigned long lblock,
         } else {
                 INCREMENT(mpStat.pagealloc);
                 mp = alloc_metapage(GFP_NOFS);
+                if (!mp)
+                        goto unlock;
                 mp->page = page;
                 mp->sb = inode->i_sb;
                 mp->flag = 0;
diff --git a/fs/jfs/super.c b/fs/jfs/super.c
index 2f14677169c3..2f7b3af5b8b7 100644
--- a/fs/jfs/super.c
+++ b/fs/jfs/super.c
@@ -853,7 +853,6 @@ out:
         }
         if (inode->i_size < off+len-towrite)
                 i_size_write(inode, off+len-towrite);
-        inode->i_version++;
         inode->i_mtime = inode->i_ctime = current_time(inode);
         mark_inode_dirty(inode);
         inode_unlock(inode);