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

Commit 2105b9ff authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull jfs updates from David Kleikamp:
 "Minor jfs updates"

* tag 'jfs-4.9' of git://github.com/kleikamp/linux-shaggy:
  jfs: Simplify code
  jfs: jump to error_out when filemap_{fdatawait, write_and_wait} fails
parents 5fdf4939 240c5185

fs/jfs/jfs_txnmgr.c

+1 −2
Original line number Diff line number Diff line
@@ -2893,8 +2893,7 @@ void txQuiesce(struct super_block *sb) 
	 * on anon_list2.  Let's check.

	 */

	if (!list_empty(&TxAnchor.anon_list2)) {

		list_splice(&TxAnchor.anon_list2, &TxAnchor.anon_list);

		INIT_LIST_HEAD(&TxAnchor.anon_list2);

		list_splice_init(&TxAnchor.anon_list2, &TxAnchor.anon_list);

		goto restart;

	}

	TXN_UNLOCK();

fs/jfs/resize.c

+8 −2
Original line number Diff line number Diff line
@@ -379,8 +379,14 @@ int jfs_extendfs(struct super_block *sb, s64 newLVSize, int newLogSize) 
	 * cached in meta-data cache, and not written out

	 * by txCommit();

	 */

	filemap_fdatawait(ipbmap->i_mapping);

	filemap_write_and_wait(ipbmap->i_mapping);

	rc = filemap_fdatawait(ipbmap->i_mapping);

	if (rc)

		goto error_out;



	rc = filemap_write_and_wait(ipbmap->i_mapping);

	if (rc)

		goto error_out;



	diWriteSpecial(ipbmap, 0);



	newPage = nPages;	/* first new page number */