diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-21 17:24:56 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-21 17:24:56 -0400 |
| commit | 3155fe6df553472fd7c07e7788b0e542cd828c91 (patch) | |
| tree | ef8179acf58cdeaa54bc7a219168fa98bb5b29c8 /fs/xfs/xfs_fsops.c | |
| parent | da48524eb20662618854bb3df2db01fc65f3070c (diff) | |
| parent | 0c9ba97318fc9a905bcc1419b6966de061203a70 (diff) | |
Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs
* 'for-linus' of git://oss.sgi.com/xfs/xfs: (23 commits)
xfs: don't name variables "panic"
xfs: factor agf counter updates into a helper
xfs: clean up the xfs_alloc_compute_aligned calling convention
xfs: kill support/debug.[ch]
xfs: Convert remaining cmn_err() callers to new API
xfs: convert the quota debug prints to new API
xfs: rename xfs_cmn_err_fsblock_zero()
xfs: convert xfs_fs_cmn_err to new error logging API
xfs: kill xfs_fs_mount_cmn_err() macro
xfs: kill xfs_fs_repair_cmn_err() macro
xfs: convert xfs_cmn_err to xfs_alert_tag
xfs: Convert xlog_warn to new logging interface
xfs: Convert linux-2.6/ files to new logging interface
xfs: introduce new logging API.
xfs: zero proper structure size for geometry calls
xfs: enable delaylog by default
xfs: more sensible inode refcounting for ialloc
xfs: stop using xfs_trans_iget in the RT allocator
xfs: check if device support discard in xfs_ioc_trim()
xfs: prevent leaking uninitialized stack memory in FSGEOMETRY_V1
...
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 */ |