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

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

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

Pull jfs updates from Dave Kleikamp:
 "Some jfs logging cleanups from Joe Perches"

* tag 'jfs-4.7' of git://github.com/kleikamp/linux-shaggy:
  jfs: Coalesce some formats
  jfs: Remove unnecessary line continuations and terminating newlines
  jfs: Remove terminating newlines from jfs_info, jfs_warn, jfs_err uses
parents cb6fd68f 6ed71e98

fs/jfs/inode.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -102,8 +102,8 @@ int jfs_commit_inode(struct inode *inode, int wait) 
		 * partitions and may think inode is dirty

		 * partitions and may think inode is dirty

		 */

		 */

		if (!special_file(inode->i_mode) && noisy) {

		if (!special_file(inode->i_mode) && noisy) {

			jfs_err("jfs_commit_inode(0x%p) called on "

			jfs_err("jfs_commit_inode(0x%p) called on read-only volume",

				   "read-only volume", inode);

				inode);

			jfs_err("Is remount racy?");

			jfs_err("Is remount racy?");

			noisy--;

			noisy--;

		}

		}

fs/jfs/jfs_discard.c

+2 −4
Original line number Original line Diff line number Diff line
@@ -49,14 +49,12 @@ void jfs_issue_discard(struct inode *ip, u64 blkno, u64 nblocks) 




	r = sb_issue_discard(sb, blkno, nblocks, GFP_NOFS, 0);

	r = sb_issue_discard(sb, blkno, nblocks, GFP_NOFS, 0);

	if (unlikely(r != 0)) {

	if (unlikely(r != 0)) {

		jfs_err("JFS: sb_issue_discard" \

		jfs_err("JFS: sb_issue_discard(%p, %llu, %llu, GFP_NOFS, 0) = %d => failed!",

			"(%p, %llu, %llu, GFP_NOFS, 0) = %d => failed!\n",

			sb, (unsigned long long)blkno,

			sb, (unsigned long long)blkno,

			(unsigned long long)nblocks, r);

			(unsigned long long)nblocks, r);

	}

	}





	jfs_info("JFS: sb_issue_discard" \

	jfs_info("JFS: sb_issue_discard(%p, %llu, %llu, GFP_NOFS, 0) = %d",

		"(%p, %llu, %llu, GFP_NOFS, 0) = %d\n",

		sb, (unsigned long long)blkno,

		sb, (unsigned long long)blkno,

		(unsigned long long)nblocks, r);

		(unsigned long long)nblocks, r);

fs/jfs/jfs_dtree.c

+4 −6
Original line number Original line Diff line number Diff line
@@ -3072,8 +3072,7 @@ int jfs_readdir(struct file *file, struct dir_context *ctx) 
			}

			}

			if (dirtab_slot.flag == DIR_INDEX_FREE) {

			if (dirtab_slot.flag == DIR_INDEX_FREE) {

				if (loop_count++ > JFS_IP(ip)->next_index) {

				if (loop_count++ > JFS_IP(ip)->next_index) {

					jfs_err("jfs_readdir detected "

					jfs_err("jfs_readdir detected infinite loop!");

						   "infinite loop!");

					ctx->pos = DIREND;

					ctx->pos = DIREND;

					return 0;

					return 0;

				}

				}
@@ -3151,8 +3150,7 @@ int jfs_readdir(struct file *file, struct dir_context *ctx) 
				if (!dir_emit(ctx, "..", 2, PARENT(ip), DT_DIR))

				if (!dir_emit(ctx, "..", 2, PARENT(ip), DT_DIR))

					return 0;

					return 0;

			} else {

			} else {

				jfs_err("jfs_readdir called with "

				jfs_err("jfs_readdir called with invalid offset!");

					"invalid offset!");

			}

			}

			dtoffset->pn = 1;

			dtoffset->pn = 1;

			dtoffset->index = 0;

			dtoffset->index = 0;
@@ -3165,8 +3163,8 @@ int jfs_readdir(struct file *file, struct dir_context *ctx) 
		}

		}





		if ((rc = dtReadNext(ip, &ctx->pos, &btstack))) {

		if ((rc = dtReadNext(ip, &ctx->pos, &btstack))) {

			jfs_err("jfs_readdir: unexpected rc = %d "

			jfs_err("jfs_readdir: unexpected rc = %d from dtReadNext",

				"from dtReadNext", rc);

				rc);

			ctx->pos = DIREND;

			ctx->pos = DIREND;

			return 0;

			return 0;

		}

		}

fs/jfs/jfs_imap.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -534,8 +534,7 @@ void diWriteSpecial(struct inode *ip, int secondary) 
	/* read the page of fixed disk inode (AIT) in raw mode */

	/* read the page of fixed disk inode (AIT) in raw mode */

	mp = read_metapage(ip, address << sbi->l2nbperpage, PSIZE, 1);

	mp = read_metapage(ip, address << sbi->l2nbperpage, PSIZE, 1);

	if (mp == NULL) {

	if (mp == NULL) {

		jfs_err("diWriteSpecial: failed to read aggregate inode "

		jfs_err("diWriteSpecial: failed to read aggregate inode extent!");

			"extent!");

		return;

		return;

	}

	}

fs/jfs/jfs_inode.c

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

	jfs_inode->xtlid = 0;

	jfs_set_inode_flags(inode);

	jfs_set_inode_flags(inode);





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

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





	return inode;

	return inode;