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

Commit b18db6de authored by Joe Perches's avatar Joe Perches Committed by Dave Kleikamp
Browse files

jfs: Remove terminating newlines from jfs_info, jfs_warn, jfs_err uses 



These macros add the newline so these cause extra blank lines
in logging output.

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarDave Kleikamp <dave.kleikamp@oracle.com>
parent 1993b176

fs/jfs/jfs_inode.c

+1 −1
Original line number Diff line number Diff line
@@ -151,7 +151,7 @@ struct inode *ialloc(struct inode *parent, umode_t mode) 
	jfs_inode->xtlid = 0;

	jfs_set_inode_flags(inode);



	jfs_info("ialloc returns inode = 0x%p\n", inode);

	jfs_info("ialloc returns inode = 0x%p", inode);



	return inode;

fs/jfs/jfs_logmgr.c

+2 −2
Original line number Diff line number Diff line
@@ -1094,7 +1094,7 @@ int lmLogOpen(struct super_block *sb) 
		if (log->bdev->bd_dev == sbi->logdev) {

			if (memcmp(log->uuid, sbi->loguuid,

				   sizeof(log->uuid))) {

				jfs_warn("wrong uuid on JFS journal\n");

				jfs_warn("wrong uuid on JFS journal");

				mutex_unlock(&jfs_log_mutex);

				return -EINVAL;

			}
@@ -2136,7 +2136,7 @@ static void lbmStartIO(struct lbuf * bp) 
	struct bio *bio;

	struct jfs_log *log = bp->l_log;



	jfs_info("lbmStartIO\n");

	jfs_info("lbmStartIO");



	bio = bio_alloc(GFP_NOFS, 1);

	bio->bi_iter.bi_sector = bp->l_blkno << (log->l2bsize - 9);

fs/jfs/jfs_txnmgr.c

+2 −2
Original line number Diff line number Diff line
@@ -1764,7 +1764,7 @@ static void xtLog(struct jfs_log * log, struct tblock * tblk, struct lrd * lrd, 
		if (lwm == next)

			goto out;

		if (lwm > next) {

			jfs_err("xtLog: lwm > next\n");

			jfs_err("xtLog: lwm > next");

			goto out;

		}

		tlck->flag |= tlckUPDATEMAP;
@@ -2814,7 +2814,7 @@ int jfs_lazycommit(void *arg) 
	if (!list_empty(&TxAnchor.unlock_queue))

		jfs_err("jfs_lazycommit being killed w/pending transactions!");

	else

		jfs_info("jfs_lazycommit being killed\n");

		jfs_info("jfs_lazycommit being killed");

	return 0;

}

fs/jfs/super.c

+2 −2
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ static void jfs_handle_error(struct super_block *sb) 
		panic("JFS (device %s): panic forced after error\n",

			sb->s_id);

	else if (sbi->flag & JFS_ERR_REMOUNT_RO) {

		jfs_err("ERROR: (device %s): remounting filesystem as read-only\n",

		jfs_err("ERROR: (device %s): remounting filesystem as read-only",

			sb->s_id);

		sb->s_flags |= MS_RDONLY;

	}
@@ -641,7 +641,7 @@ static int jfs_freeze(struct super_block *sb) 
		}

		rc = updateSuper(sb, FM_CLEAN);

		if (rc) {

			jfs_err("jfs_freeze: updateSuper failed\n");

			jfs_err("jfs_freeze: updateSuper failed");

			/*

			 * Don't fail here. Everything succeeded except

			 * marking the superblock clean, so there's really