Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ac446dcc authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 5cea7647 88a96fa8

fs/jfs/jfs_metapage.c

+2 −0
Original line number Diff line number Diff line
@@ -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;

fs/jfs/super.c

+0 −1
Original line number Diff line number Diff line
@@ -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);