diff options
| author | Patrick McHardy <kaber@trash.net> | 2011-04-13 07:32:28 -0400 |
|---|---|---|
| committer | Patrick McHardy <kaber@trash.net> | 2011-04-13 07:32:28 -0400 |
| commit | b32e3dc7860d00124fa432dba09667e647cb9bcc (patch) | |
| tree | 2fa6e56f389431dfb84609d3d7572cad76e88e71 /fs/xfs/xfs_fsops.c | |
| parent | 6604271c5bc658a6067ed0c3deba4d89e0e50382 (diff) | |
| parent | 96120d86fe302c006259baee9061eea9e1b9e486 (diff) | |
Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6
Diffstat (limited to 'fs/xfs/xfs_fsops.c')
| -rw-r--r-- | fs/xfs/xfs_fsops.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/xfs/xfs_fsops.c b/fs/xfs/xfs_fsops.c index 85668efb3e3e..9153d2c77caf 100644 --- a/fs/xfs/xfs_fsops.c +++ b/fs/xfs/xfs_fsops.c | |||
| @@ -385,8 +385,8 @@ xfs_growfs_data_private( | |||
| 385 | XFS_AGB_TO_DADDR(mp, agno, XFS_SB_BLOCK(mp)), | 385 | XFS_AGB_TO_DADDR(mp, agno, XFS_SB_BLOCK(mp)), |
| 386 | XFS_FSS_TO_BB(mp, 1), 0, &bp); | 386 | XFS_FSS_TO_BB(mp, 1), 0, &bp); |
| 387 | if (error) { | 387 | if (error) { |
| 388 | xfs_fs_cmn_err(CE_WARN, mp, | 388 | xfs_warn(mp, |
| 389 | "error %d reading secondary superblock for ag %d", | 389 | "error %d reading secondary superblock for ag %d", |
| 390 | error, agno); | 390 | error, agno); |
| 391 | break; | 391 | break; |
| 392 | } | 392 | } |
| @@ -399,7 +399,7 @@ xfs_growfs_data_private( | |||
| 399 | if (!(error = xfs_bwrite(mp, bp))) { | 399 | if (!(error = xfs_bwrite(mp, bp))) { |
| 400 | continue; | 400 | continue; |
| 401 | } else { | 401 | } else { |
| 402 | xfs_fs_cmn_err(CE_WARN, mp, | 402 | xfs_warn(mp, |
| 403 | "write error %d updating secondary superblock for ag %d", | 403 | "write error %d updating secondary superblock for ag %d", |
| 404 | error, agno); | 404 | error, agno); |
| 405 | break; /* no point in continuing */ | 405 | break; /* no point in continuing */ |