diff options
author | Alex Elder <aelder@sgi.com> | 2010-06-04 13:22:30 -0500 |
---|---|---|
committer | Alex Elder <aelder@sgi.com> | 2010-06-04 13:22:30 -0500 |
commit | 1bf7dbfde8fe7ddaa8e2e1b4e0fc41a9fc6aa7a5 (patch) | |
tree | fdb99e686fa40e79cc53f80dfed58e9b548ed4eb /fs/xfs/xfs_rtalloc.h | |
parent | ad8456361fa19068cf49b50a4f98e41b73c08e76 (diff) | |
parent | f9369729496a0f4c607a4cc1ea4dfeddbbfc505a (diff) | |
download | linux-1bf7dbfde8fe7ddaa8e2e1b4e0fc41a9fc6aa7a5.tar.gz |
Merge branch 'master' into for-linus
Diffstat (limited to 'fs/xfs/xfs_rtalloc.h')
-rw-r--r-- | fs/xfs/xfs_rtalloc.h | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/fs/xfs/xfs_rtalloc.h b/fs/xfs/xfs_rtalloc.h index b2d67adb6a08..ff614c29b441 100644 --- a/fs/xfs/xfs_rtalloc.h +++ b/fs/xfs/xfs_rtalloc.h @@ -147,7 +147,16 @@ xfs_growfs_rt( # define xfs_rtfree_extent(t,b,l) (ENOSYS) # define xfs_rtpick_extent(m,t,l,rb) (ENOSYS) # define xfs_growfs_rt(mp,in) (ENOSYS) -# define xfs_rtmount_init(m) (((mp)->m_sb.sb_rblocks == 0)? 0 : (ENOSYS)) +static inline int /* error */ +xfs_rtmount_init( + xfs_mount_t *mp) /* file system mount structure */ +{ + if (mp->m_sb.sb_rblocks == 0) + return 0; + + cmn_err(CE_WARN, "XFS: Not built with CONFIG_XFS_RT"); + return ENOSYS; +} # define xfs_rtmount_inodes(m) (((mp)->m_sb.sb_rblocks == 0)? 0 : (ENOSYS)) # define xfs_rtunmount_inodes(m) #endif /* CONFIG_XFS_RT */ |