diff options
author | Sage Weil <sage@inktank.com> | 2013-08-15 14:11:45 -0400 |
---|---|---|
committer | Sage Weil <sage@inktank.com> | 2013-08-15 14:11:45 -0400 |
commit | ee3e542fec6e69bc9fb668698889a37d93950ddf (patch) | |
tree | e74ee766a4764769ef1d3d45d266b4dea64101d3 /fs/jfs/resize.c | |
parent | fe2a801b50c0bb8039d627e5ae1fec249d10ff39 (diff) | |
parent | f1d6e17f540af37bb1891480143669ba7636c4cf (diff) |
Merge remote-tracking branch 'linus/master' into testing
Diffstat (limited to 'fs/jfs/resize.c')
-rw-r--r-- | fs/jfs/resize.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/jfs/resize.c b/fs/jfs/resize.c index 8d0c1c7c0820..90b3bc21e9b0 100644 --- a/fs/jfs/resize.c +++ b/fs/jfs/resize.c | |||
@@ -530,7 +530,7 @@ int jfs_extendfs(struct super_block *sb, s64 newLVSize, int newLogSize) | |||
530 | goto resume; | 530 | goto resume; |
531 | 531 | ||
532 | error_out: | 532 | error_out: |
533 | jfs_error(sb, "jfs_extendfs"); | 533 | jfs_error(sb, "\n"); |
534 | 534 | ||
535 | resume: | 535 | resume: |
536 | /* | 536 | /* |