Commit 56c003e4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'jfs-6.2' of https://github.com/kleikamp/linux-shaggy 

Pull jfs updates from David Kleikamp:
 "Assorted JFS fixes for 6.2"

* tag 'jfs-6.2' of https://github.com/kleikamp/linux-shaggy:
  jfs: makes diUnmount/diMount in jfs_mount_rw atomic
  jfs: Fix a typo in function jfs_umount
  fs: jfs: fix shift-out-of-bounds in dbDiscardAG
  jfs: Fix fortify moan in symlink
  jfs: remove redundant assignments to ipaimap and ipaimap2
  jfs: remove unused declarations for jfs
  fs/jfs/jfs_xattr.h: Fix spelling typo in comment
  MAINTAINERS: git://github -> https://github.com for kleikamp
  fs/jfs: replace ternary operator with min_t()
  fs: jfs: fix shift-out-of-bounds in dbAllocAG
parents cda6a60a a60dca73

MAINTAINERS

+2 −2
Original line number Diff line number Diff line
@@ -10993,9 +10993,9 @@ F: drivers/hwmon/jc42.c 
JFS FILESYSTEM

M:	Dave Kleikamp <shaggy@kernel.org>

L:	jfs-discussion@lists.sourceforge.net

S:	Maintained

S:	Odd Fixes

W:	http://jfs.sourceforge.net/

T:	git git://github.com/kleikamp/linux-shaggy.git

T:	git https://github.com/kleikamp/linux-shaggy.git

F:	Documentation/admin-guide/jfs.rst

F:	fs/jfs/
































fs/jfs/jfs_dmap.c



+21
−6






























Original line number
Diff line number
Diff line







@@ -155,7 +155,7 @@ int dbMount(struct inode *ipbmap)







	struct bmap *bmp;









	struct dbmap_disk *dbmp_le;









	struct metapage *mp;









	int i;









	int i, err;



















	/*









	 * allocate/initialize the in-memory bmap descriptor








@@ -170,8 +170,8 @@ int dbMount(struct inode *ipbmap)







			   BMAPBLKNO << JFS_SBI(ipbmap->i_sb)->l2nbperpage,









			   PSIZE, 0);









	if (mp == NULL) {









		kfree(bmp);









		return -EIO;









		err = -EIO;









		goto err_kfree_bmp;









	}



















	/* copy the on-disk bmap descriptor to its in-memory version. */








@@ -181,9 +181,8 @@ int dbMount(struct inode *ipbmap)







	bmp->db_l2nbperpage = le32_to_cpu(dbmp_le->dn_l2nbperpage);









	bmp->db_numag = le32_to_cpu(dbmp_le->dn_numag);









	if (!bmp->db_numag) {









		release_metapage(mp);









		kfree(bmp);









		return -EINVAL;









		err = -EINVAL;









		goto err_release_metapage;









	}



















	bmp->db_maxlevel = le32_to_cpu(dbmp_le->dn_maxlevel);








@@ -194,6 +193,16 @@ int dbMount(struct inode *ipbmap)







	bmp->db_agwidth = le32_to_cpu(dbmp_le->dn_agwidth);









	bmp->db_agstart = le32_to_cpu(dbmp_le->dn_agstart);









	bmp->db_agl2size = le32_to_cpu(dbmp_le->dn_agl2size);









	if (bmp->db_agl2size > L2MAXL2SIZE - L2MAXAG) {









		err = -EINVAL;









		goto err_release_metapage;









	}



















	if (((bmp->db_mapsize - 1) >> bmp->db_agl2size) > MAXAG) {









		err = -EINVAL;









		goto err_release_metapage;









	}



















	for (i = 0; i < MAXAG; i++)









		bmp->db_agfree[i] = le64_to_cpu(dbmp_le->dn_agfree[i]);









	bmp->db_agsize = le64_to_cpu(dbmp_le->dn_agsize);








@@ -214,6 +223,12 @@ int dbMount(struct inode *ipbmap)







	BMAP_LOCK_INIT(bmp);



















	return (0);



















err_release_metapage:









	release_metapage(mp);









err_kfree_bmp:









	kfree(bmp);









	return err;









}




















































fs/jfs/jfs_extent.h



+0
−2






























Original line number
Diff line number
Diff line







@@ -10,9 +10,7 @@







	(addressPXD(&(JFS_IP(ip)->ixpxd)) + lengthPXD(&(JFS_IP(ip)->ixpxd)) - 1)



















extern int	extAlloc(struct inode *, s64, s64, xad_t *, bool);









extern int	extFill(struct inode *, xad_t *);









extern int	extHint(struct inode *, s64, xad_t *);









extern int	extRealloc(struct inode *, s64, xad_t *, bool);









extern int	extRecord(struct inode *, xad_t *);



















#endif	/* _H_JFS_EXTENT */
























fs/jfs/jfs_imap.c



+1
−1






























Original line number
Diff line number
Diff line







@@ -310,8 +310,8 @@ int diRead(struct inode *ip)







	iagno = INOTOIAG(ip->i_ino);



















	/* read the iag */









	imap = JFS_IP(ipimap)->i_imap;









	IREAD_LOCK(ipimap, RDWRLOCK_IMAP);









	imap = JFS_IP(ipimap)->i_imap;









	rc = diIAGRead(imap, iagno, &mp);









	IREAD_UNLOCK(ipimap);









	if (rc) {
































fs/jfs/jfs_mount.c



+4
−0






























Original line number
Diff line number
Diff line







@@ -234,11 +234,15 @@ int jfs_mount_rw(struct super_block *sb, int remount)

















		truncate_inode_pages(sbi->ipimap->i_mapping, 0);









		truncate_inode_pages(sbi->ipbmap->i_mapping, 0);



















		IWRITE_LOCK(sbi->ipimap, RDWRLOCK_IMAP);









		diUnmount(sbi->ipimap, 1);









		if ((rc = diMount(sbi->ipimap))) {









			IWRITE_UNLOCK(sbi->ipimap);









			jfs_err("jfs_mount_rw: diMount failed!");









			return rc;









		}









		IWRITE_UNLOCK(sbi->ipimap);



















		dbUnmount(sbi->ipbmap, 1);









		if ((rc = dbMount(sbi->ipbmap))) {