summaryrefslogtreecommitdiffstats
path: root/fs/jfs/super.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-05-17 14:15:18 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2016-05-17 14:15:18 -0700
commitdba1e987312ed318dfd46d4684e9e97b2223f2e8 (patch)
treea993fee57793a70775276cfc5bc10442258bf735 /fs/jfs/super.c
parentcb6fd68fdd4a94880a99ad8515844c7a25e50d3e (diff)
parent6ed71e9819ac3412fc6a3495f5ce141df274c916 (diff)
downloadop-kernel-dev-dba1e987312ed318dfd46d4684e9e97b2223f2e8.zip
op-kernel-dev-dba1e987312ed318dfd46d4684e9e97b2223f2e8.tar.gz
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
Diffstat (limited to 'fs/jfs/super.c')
-rw-r--r--fs/jfs/super.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/jfs/super.c b/fs/jfs/super.c
index 78d5991..cec8814 100644
--- a/fs/jfs/super.c
+++ b/fs/jfs/super.c
@@ -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
OpenPOWER on IntegriCloud