mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-27 03:10:12 +00:00
9de67c3ba9
Today, if we perform an xfs_growfs which adds allocation groups,
mp->m_maxagi is not properly updated when the growfs is complete.
Therefore inodes will continue to be allocated only in the
AGs which existed prior to the growfs, and the new space
won't be utilized.
This is because of this path in xfs_growfs_data_private():
xfs_growfs_data_private
xfs_initialize_perag(mp, nagcount, &nagimax);
if (mp->m_flags & XFS_MOUNT_32BITINODES)
index = xfs_set_inode32(mp);
else
index = xfs_set_inode64(mp);
if (maxagi)
*maxagi = index;
where xfs_set_inode* iterates over the (old) agcount in
mp->m_sb.sb_agblocks, which has not yet been updated
in the growfs path. So "index" will be returned based on
the old agcount, not the new one, and new AGs are not available
for inode allocation.
Fix this by explicitly passing the proper AG count (which
xfs_initialize_perag() already has) down another level,
so that xfs_set_inode* can make the proper decision about
acceptable AGs for inode allocation in the potentially
newly-added AGs.
This has been broken since 3.7, when these two
xfs_set_inode* functions were added in commit 2d2194f.
Prior to that, we looped over "agcount" not sb_agblocks
in these calculations.
Signed-off-by: Eric Sandeen <sandeen@redhat.com>
Reviewed-by: Brian Foster <bfoster@redhat.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>
88 lines
2.4 KiB
C
88 lines
2.4 KiB
C
/*
|
|
* Copyright (c) 2000-2005 Silicon Graphics, Inc.
|
|
* All Rights Reserved.
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License as
|
|
* published by the Free Software Foundation.
|
|
*
|
|
* This program is distributed in the hope that it would be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write the Free Software Foundation,
|
|
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
|
*/
|
|
#ifndef __XFS_SUPER_H__
|
|
#define __XFS_SUPER_H__
|
|
|
|
#include <linux/exportfs.h>
|
|
|
|
#ifdef CONFIG_XFS_QUOTA
|
|
extern int xfs_qm_init(void);
|
|
extern void xfs_qm_exit(void);
|
|
#else
|
|
# define xfs_qm_init() (0)
|
|
# define xfs_qm_exit() do { } while (0)
|
|
#endif
|
|
|
|
#ifdef CONFIG_XFS_POSIX_ACL
|
|
# define XFS_ACL_STRING "ACLs, "
|
|
# define set_posix_acl_flag(sb) ((sb)->s_flags |= MS_POSIXACL)
|
|
#else
|
|
# define XFS_ACL_STRING
|
|
# define set_posix_acl_flag(sb) do { } while (0)
|
|
#endif
|
|
|
|
#define XFS_SECURITY_STRING "security attributes, "
|
|
|
|
#ifdef CONFIG_XFS_RT
|
|
# define XFS_REALTIME_STRING "realtime, "
|
|
#else
|
|
# define XFS_REALTIME_STRING
|
|
#endif
|
|
|
|
#if XFS_BIG_BLKNOS
|
|
# if XFS_BIG_INUMS
|
|
# define XFS_BIGFS_STRING "large block/inode numbers, "
|
|
# else
|
|
# define XFS_BIGFS_STRING "large block numbers, "
|
|
# endif
|
|
#else
|
|
# define XFS_BIGFS_STRING
|
|
#endif
|
|
|
|
#ifdef DEBUG
|
|
# define XFS_DBG_STRING "debug"
|
|
#else
|
|
# define XFS_DBG_STRING "no debug"
|
|
#endif
|
|
|
|
#define XFS_VERSION_STRING "SGI XFS"
|
|
#define XFS_BUILD_OPTIONS XFS_ACL_STRING \
|
|
XFS_SECURITY_STRING \
|
|
XFS_REALTIME_STRING \
|
|
XFS_BIGFS_STRING \
|
|
XFS_DBG_STRING /* DBG must be last */
|
|
|
|
struct xfs_inode;
|
|
struct xfs_mount;
|
|
struct xfs_buftarg;
|
|
struct block_device;
|
|
|
|
extern __uint64_t xfs_max_file_offset(unsigned int);
|
|
|
|
extern void xfs_flush_inodes(struct xfs_mount *mp);
|
|
extern void xfs_blkdev_issue_flush(struct xfs_buftarg *);
|
|
extern xfs_agnumber_t xfs_set_inode32(struct xfs_mount *, xfs_agnumber_t agcount);
|
|
extern xfs_agnumber_t xfs_set_inode64(struct xfs_mount *, xfs_agnumber_t agcount);
|
|
|
|
extern const struct export_operations xfs_export_operations;
|
|
extern const struct xattr_handler *xfs_xattr_handlers[];
|
|
extern const struct quotactl_ops xfs_quotactl_operations;
|
|
|
|
#define XFS_M(sb) ((struct xfs_mount *)((sb)->s_fs_info))
|
|
|
|
#endif /* __XFS_SUPER_H__ */
|