diff options
| author | Len Brown <len.brown@intel.com> | 2006-06-29 19:57:46 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2006-06-29 19:57:46 -0400 |
| commit | d120cfb544ed6161b9d32fb6c4648c471807ee6b (patch) | |
| tree | 7757ad0198d8df76ff5c60f939a687687c41da00 /fs/xfs/xfs_rtalloc.c | |
| parent | 9dce0e950dbfab4148f35ac6f297d8638cdc63c4 (diff) | |
| parent | bf7e8511088963078484132636839b59e25cf14f (diff) | |
merge linus into release branch
Conflicts:
drivers/acpi/acpi_memhotplug.c
Diffstat (limited to 'fs/xfs/xfs_rtalloc.c')
| -rw-r--r-- | fs/xfs/xfs_rtalloc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/xfs/xfs_rtalloc.c b/fs/xfs/xfs_rtalloc.c index 0c1e42b037ef..5a0b678956e0 100644 --- a/fs/xfs/xfs_rtalloc.c +++ b/fs/xfs/xfs_rtalloc.c | |||
| @@ -1929,7 +1929,7 @@ xfs_growfs_rt( | |||
| 1929 | /* | 1929 | /* |
| 1930 | * Initial error checking. | 1930 | * Initial error checking. |
| 1931 | */ | 1931 | */ |
| 1932 | if (mp->m_rtdev_targp || mp->m_rbmip == NULL || | 1932 | if (mp->m_rtdev_targp == NULL || mp->m_rbmip == NULL || |
| 1933 | (nrblocks = in->newblocks) <= sbp->sb_rblocks || | 1933 | (nrblocks = in->newblocks) <= sbp->sb_rblocks || |
| 1934 | (sbp->sb_rblocks && (in->extsize != sbp->sb_rextsize))) | 1934 | (sbp->sb_rblocks && (in->extsize != sbp->sb_rextsize))) |
| 1935 | return XFS_ERROR(EINVAL); | 1935 | return XFS_ERROR(EINVAL); |