summaryrefslogtreecommitdiffstats
path: root/fs/xfs/xfs_rtalloc.c
diff options
context:
space:
mode:
authorDave Chinner <david@fromorbit.com>2014-08-04 13:54:14 +1000
committerDave Chinner <david@fromorbit.com>2014-08-04 13:54:14 +1000
commit4d7eece2c0dad832c5f224629eba3cced3f2d6cd (patch)
treecddf541ea3c2860aaea0fed1f57871d310c3c14e /fs/xfs/xfs_rtalloc.c
parente0ac6d45bc52065d388b5aa153b58233af25a429 (diff)
parentd5cf09baced0ef3d2cc118865079f8b129e98e2f (diff)
downloadtalos-obmc-linux-4d7eece2c0dad832c5f224629eba3cced3f2d6cd.tar.gz
talos-obmc-linux-4d7eece2c0dad832c5f224629eba3cced3f2d6cd.zip
Merge branch 'xfs-misc-fixes-3.17-1' into for-next
Diffstat (limited to 'fs/xfs/xfs_rtalloc.c')
-rw-r--r--fs/xfs/xfs_rtalloc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/xfs/xfs_rtalloc.c b/fs/xfs/xfs_rtalloc.c
index b741d7286990..909e143b87ae 100644
--- a/fs/xfs/xfs_rtalloc.c
+++ b/fs/xfs/xfs_rtalloc.c
@@ -944,9 +944,9 @@ xfs_growfs_rt(
xfs_buf_t *bp; /* temporary buffer */
int error; /* error return value */
xfs_mount_t *nmp; /* new (fake) mount structure */
- xfs_drfsbno_t nrblocks; /* new number of realtime blocks */
+ xfs_rfsblock_t nrblocks; /* new number of realtime blocks */
xfs_extlen_t nrbmblocks; /* new number of rt bitmap blocks */
- xfs_drtbno_t nrextents; /* new number of realtime extents */
+ xfs_rtblock_t nrextents; /* new number of realtime extents */
uint8_t nrextslog; /* new log2 of sb_rextents */
xfs_extlen_t nrsumblocks; /* new number of summary blocks */
uint nrsumlevels; /* new rt summary levels */
OpenPOWER on IntegriCloud