From 04d73f86e35d41410ec55242b90330ec23dfe2b0 Mon Sep 17 00:00:00 2001 From: Jeff Layton Date: Mon, 30 Oct 2017 11:16:07 -0400 Subject: jfs: remove increment of i_version counter JFS does not set SB_I_VERSION and doesn't use the i_version counter internally. Just remove this increment. Signed-off-by: Jeff Layton Signed-off-by: Dave Kleikamp --- fs/jfs/super.c | 1 - 1 file changed, 1 deletion(-) (limited to 'fs/jfs') 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); -- cgit v1.2.3-59-g8ed1b From 88a96fa84186deadb8b1ecc8cb066cd7afeb5bf2 Mon Sep 17 00:00:00 2001 From: Juerg Haefliger Date: Wed, 4 Oct 2017 04:24:41 -0400 Subject: jfs: Add missing NULL pointer check in __get_metapage alloc_metapage can return a NULL pointer so check for that. Signed-off-by: Juerg Haefliger Signed-off-by: Dave Kleikamp --- fs/jfs/jfs_metapage.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'fs/jfs') 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; -- cgit v1.2.3-59-g8ed1b