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

diff --git a/fs/jfs/jfs_metapage.c b/fs/jfs/jfs_metapage.c
index 1c4b9ad4d7ab66446dae9241f44abe69429d33fb..1a3b0cc22ad3ea1d30a30749f663503e2f2696da 100644 (file)
--- 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 2f14677169c374b7b0dfaedf6e4027464d42916d..2f7b3af5b8b7aa9fef38db0c464f5a4d013aff7b 100644 (file)
--- a/fs/jfs/super.c
+++ b/fs/jfs/super.c
@@ -853,7 +853,6 @@ static ssize_t jfs_quota_write(struct super_block *sb, int type,
        }
        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);