diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-11 19:19:34 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-11 19:19:34 +0200 |
| commit | 9db019278cad416681e27b15203d4c5e939c315b (patch) | |
| tree | e0c7e440af4444176a34320e18df8d623201dad5 /fs/jfs/jfs_txnmgr.c | |
| parent | Merge branch 'for-3.11' of git://linux-nfs.org/~bfields/linux (diff) | |
| parent | jfs: Update jfs_error (diff) | |
| download | linux-9db019278cad416681e27b15203d4c5e939c315b.tar.xz linux-9db019278cad416681e27b15203d4c5e939c315b.zip | |
Merge tag 'jfs-3.11' of git://github.com/kleikamp/linux-shaggy
Pull jfs update from Dave Kleikamp:
"A couple cleanups to JFS for 3.11"
* tag 'jfs-3.11' of git://github.com/kleikamp/linux-shaggy:
jfs: Update jfs_error
jfs: fix sparse warning in fs/jfs/xattr.c
Diffstat (limited to 'fs/jfs/jfs_txnmgr.c')
| -rw-r--r-- | fs/jfs/jfs_txnmgr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/jfs/jfs_txnmgr.c b/fs/jfs/jfs_txnmgr.c index 5fcc02eaa64c..564c4f279ac6 100644 --- a/fs/jfs/jfs_txnmgr.c +++ b/fs/jfs/jfs_txnmgr.c @@ -2684,7 +2684,7 @@ void txAbort(tid_t tid, int dirty) * mark filesystem dirty */ if (dirty) - jfs_error(tblk->sb, "txAbort"); + jfs_error(tblk->sb, "\n"); return; } |