mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-06 16:49:22 +00:00
xfs: move xfs_get_extsz_hint() and kill xfs_rw.h
The only thing left in xfs_rw.h is a function prototype for an inode function. Move that to xfs_inode.h, and kill xfs_rw.h. Also move the function implementing the prototype from xfs_rw.c to xfs_inode.c so we only have one function left in xfs_rw.c Signed-off-by: Dave Chinner <dchinner@redhat.com> Reviewed-by: Mark Tinguely <tinguely@sgi.com> Reviewed-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Ben Myers <bpm@sgi.com>
This commit is contained in:
parent
fd50092c08
commit
2a0ec1d9ed
16 changed files with 16 additions and 57 deletions
|
@ -28,7 +28,6 @@
|
||||||
#include "xfs_inode_item.h"
|
#include "xfs_inode_item.h"
|
||||||
#include "xfs_alloc.h"
|
#include "xfs_alloc.h"
|
||||||
#include "xfs_error.h"
|
#include "xfs_error.h"
|
||||||
#include "xfs_rw.h"
|
|
||||||
#include "xfs_iomap.h"
|
#include "xfs_iomap.h"
|
||||||
#include "xfs_vnodeops.h"
|
#include "xfs_vnodeops.h"
|
||||||
#include "xfs_trace.h"
|
#include "xfs_trace.h"
|
||||||
|
|
|
@ -38,7 +38,6 @@
|
||||||
#include "xfs_error.h"
|
#include "xfs_error.h"
|
||||||
#include "xfs_quota.h"
|
#include "xfs_quota.h"
|
||||||
#include "xfs_trans_space.h"
|
#include "xfs_trans_space.h"
|
||||||
#include "xfs_rw.h"
|
|
||||||
#include "xfs_vnodeops.h"
|
#include "xfs_vnodeops.h"
|
||||||
#include "xfs_trace.h"
|
#include "xfs_trace.h"
|
||||||
|
|
||||||
|
|
|
@ -41,7 +41,6 @@
|
||||||
#include "xfs_rtalloc.h"
|
#include "xfs_rtalloc.h"
|
||||||
#include "xfs_error.h"
|
#include "xfs_error.h"
|
||||||
#include "xfs_attr_leaf.h"
|
#include "xfs_attr_leaf.h"
|
||||||
#include "xfs_rw.h"
|
|
||||||
#include "xfs_quota.h"
|
#include "xfs_quota.h"
|
||||||
#include "xfs_trans_space.h"
|
#include "xfs_trans_space.h"
|
||||||
#include "xfs_buf_item.h"
|
#include "xfs_buf_item.h"
|
||||||
|
|
|
@ -38,7 +38,6 @@
|
||||||
#include "xfs_itable.h"
|
#include "xfs_itable.h"
|
||||||
#include "xfs_trans_space.h"
|
#include "xfs_trans_space.h"
|
||||||
#include "xfs_rtalloc.h"
|
#include "xfs_rtalloc.h"
|
||||||
#include "xfs_rw.h"
|
|
||||||
#include "xfs_filestream.h"
|
#include "xfs_filestream.h"
|
||||||
#include "xfs_trace.h"
|
#include "xfs_trace.h"
|
||||||
|
|
||||||
|
|
|
@ -61,6 +61,20 @@ STATIC int xfs_iformat_local(xfs_inode_t *, xfs_dinode_t *, int, int);
|
||||||
STATIC int xfs_iformat_extents(xfs_inode_t *, xfs_dinode_t *, int);
|
STATIC int xfs_iformat_extents(xfs_inode_t *, xfs_dinode_t *, int);
|
||||||
STATIC int xfs_iformat_btree(xfs_inode_t *, xfs_dinode_t *, int);
|
STATIC int xfs_iformat_btree(xfs_inode_t *, xfs_dinode_t *, int);
|
||||||
|
|
||||||
|
/*
|
||||||
|
* helper function to extract extent size hint from inode
|
||||||
|
*/
|
||||||
|
xfs_extlen_t
|
||||||
|
xfs_get_extsz_hint(
|
||||||
|
struct xfs_inode *ip)
|
||||||
|
{
|
||||||
|
if ((ip->i_d.di_flags & XFS_DIFLAG_EXTSIZE) && ip->i_d.di_extsize)
|
||||||
|
return ip->i_d.di_extsize;
|
||||||
|
if (XFS_IS_REALTIME_INODE(ip))
|
||||||
|
return ip->i_mount->m_sb.sb_rextsize;
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
#ifdef DEBUG
|
#ifdef DEBUG
|
||||||
/*
|
/*
|
||||||
* Make sure that the extents in the given memory buffer
|
* Make sure that the extents in the given memory buffer
|
||||||
|
|
|
@ -533,6 +533,8 @@ int xfs_iflush(struct xfs_inode *, struct xfs_buf **);
|
||||||
void xfs_lock_inodes(xfs_inode_t **, int, uint);
|
void xfs_lock_inodes(xfs_inode_t **, int, uint);
|
||||||
void xfs_lock_two_inodes(xfs_inode_t *, xfs_inode_t *, uint);
|
void xfs_lock_two_inodes(xfs_inode_t *, xfs_inode_t *, uint);
|
||||||
|
|
||||||
|
xfs_extlen_t xfs_get_extsz_hint(struct xfs_inode *ip);
|
||||||
|
|
||||||
#define IHOLD(ip) \
|
#define IHOLD(ip) \
|
||||||
do { \
|
do { \
|
||||||
ASSERT(atomic_read(&VFS_I(ip)->i_count) > 0) ; \
|
ASSERT(atomic_read(&VFS_I(ip)->i_count) > 0) ; \
|
||||||
|
|
|
@ -36,7 +36,6 @@
|
||||||
#include "xfs_rtalloc.h"
|
#include "xfs_rtalloc.h"
|
||||||
#include "xfs_error.h"
|
#include "xfs_error.h"
|
||||||
#include "xfs_itable.h"
|
#include "xfs_itable.h"
|
||||||
#include "xfs_rw.h"
|
|
||||||
#include "xfs_attr.h"
|
#include "xfs_attr.h"
|
||||||
#include "xfs_buf_item.h"
|
#include "xfs_buf_item.h"
|
||||||
#include "xfs_trans_space.h"
|
#include "xfs_trans_space.h"
|
||||||
|
|
|
@ -33,7 +33,6 @@
|
||||||
#include "xfs_rtalloc.h"
|
#include "xfs_rtalloc.h"
|
||||||
#include "xfs_error.h"
|
#include "xfs_error.h"
|
||||||
#include "xfs_itable.h"
|
#include "xfs_itable.h"
|
||||||
#include "xfs_rw.h"
|
|
||||||
#include "xfs_attr.h"
|
#include "xfs_attr.h"
|
||||||
#include "xfs_buf_item.h"
|
#include "xfs_buf_item.h"
|
||||||
#include "xfs_utils.h"
|
#include "xfs_utils.h"
|
||||||
|
|
|
@ -34,7 +34,6 @@
|
||||||
#include "xfs_trans_priv.h"
|
#include "xfs_trans_priv.h"
|
||||||
#include "xfs_dinode.h"
|
#include "xfs_dinode.h"
|
||||||
#include "xfs_inode.h"
|
#include "xfs_inode.h"
|
||||||
#include "xfs_rw.h"
|
|
||||||
#include "xfs_trace.h"
|
#include "xfs_trace.h"
|
||||||
|
|
||||||
kmem_zone_t *xfs_log_ticket_zone;
|
kmem_zone_t *xfs_log_ticket_zone;
|
||||||
|
|
|
@ -40,7 +40,6 @@
|
||||||
#include "xfs_extfree_item.h"
|
#include "xfs_extfree_item.h"
|
||||||
#include "xfs_trans_priv.h"
|
#include "xfs_trans_priv.h"
|
||||||
#include "xfs_quota.h"
|
#include "xfs_quota.h"
|
||||||
#include "xfs_rw.h"
|
|
||||||
#include "xfs_utils.h"
|
#include "xfs_utils.h"
|
||||||
#include "xfs_trace.h"
|
#include "xfs_trace.h"
|
||||||
|
|
||||||
|
|
|
@ -38,7 +38,6 @@
|
||||||
#include "xfs_rtalloc.h"
|
#include "xfs_rtalloc.h"
|
||||||
#include "xfs_bmap.h"
|
#include "xfs_bmap.h"
|
||||||
#include "xfs_error.h"
|
#include "xfs_error.h"
|
||||||
#include "xfs_rw.h"
|
|
||||||
#include "xfs_quota.h"
|
#include "xfs_quota.h"
|
||||||
#include "xfs_fsops.h"
|
#include "xfs_fsops.h"
|
||||||
#include "xfs_utils.h"
|
#include "xfs_utils.h"
|
||||||
|
|
|
@ -33,7 +33,6 @@
|
||||||
#include "xfs_rtalloc.h"
|
#include "xfs_rtalloc.h"
|
||||||
#include "xfs_fsops.h"
|
#include "xfs_fsops.h"
|
||||||
#include "xfs_error.h"
|
#include "xfs_error.h"
|
||||||
#include "xfs_rw.h"
|
|
||||||
#include "xfs_inode_item.h"
|
#include "xfs_inode_item.h"
|
||||||
#include "xfs_trans_space.h"
|
#include "xfs_trans_space.h"
|
||||||
#include "xfs_utils.h"
|
#include "xfs_utils.h"
|
||||||
|
|
|
@ -28,7 +28,6 @@
|
||||||
#include "xfs_dinode.h"
|
#include "xfs_dinode.h"
|
||||||
#include "xfs_inode.h"
|
#include "xfs_inode.h"
|
||||||
#include "xfs_error.h"
|
#include "xfs_error.h"
|
||||||
#include "xfs_rw.h"
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Force a shutdown of the filesystem instantly while keeping
|
* Force a shutdown of the filesystem instantly while keeping
|
||||||
|
@ -89,17 +88,3 @@ xfs_do_force_shutdown(
|
||||||
"Please umount the filesystem and rectify the problem(s)");
|
"Please umount the filesystem and rectify the problem(s)");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
|
||||||
* helper function to extract extent size hint from inode
|
|
||||||
*/
|
|
||||||
xfs_extlen_t
|
|
||||||
xfs_get_extsz_hint(
|
|
||||||
struct xfs_inode *ip)
|
|
||||||
{
|
|
||||||
if ((ip->i_d.di_flags & XFS_DIFLAG_EXTSIZE) && ip->i_d.di_extsize)
|
|
||||||
return ip->i_d.di_extsize;
|
|
||||||
if (XFS_IS_REALTIME_INODE(ip))
|
|
||||||
return ip->i_mount->m_sb.sb_rextsize;
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
|
@ -1,30 +0,0 @@
|
||||||
/*
|
|
||||||
* Copyright (c) 2000-2006 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_RW_H__
|
|
||||||
#define __XFS_RW_H__
|
|
||||||
|
|
||||||
struct xfs_buf;
|
|
||||||
struct xfs_inode;
|
|
||||||
struct xfs_mount;
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Prototypes for functions in xfs_rw.c.
|
|
||||||
*/
|
|
||||||
extern xfs_extlen_t xfs_get_extsz_hint(struct xfs_inode *ip);
|
|
||||||
|
|
||||||
#endif /* __XFS_RW_H__ */
|
|
|
@ -32,7 +32,6 @@
|
||||||
#include "xfs_buf_item.h"
|
#include "xfs_buf_item.h"
|
||||||
#include "xfs_trans_priv.h"
|
#include "xfs_trans_priv.h"
|
||||||
#include "xfs_error.h"
|
#include "xfs_error.h"
|
||||||
#include "xfs_rw.h"
|
|
||||||
#include "xfs_trace.h"
|
#include "xfs_trace.h"
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
|
@ -38,7 +38,6 @@
|
||||||
#include "xfs_bmap.h"
|
#include "xfs_bmap.h"
|
||||||
#include "xfs_acl.h"
|
#include "xfs_acl.h"
|
||||||
#include "xfs_attr.h"
|
#include "xfs_attr.h"
|
||||||
#include "xfs_rw.h"
|
|
||||||
#include "xfs_error.h"
|
#include "xfs_error.h"
|
||||||
#include "xfs_quota.h"
|
#include "xfs_quota.h"
|
||||||
#include "xfs_utils.h"
|
#include "xfs_utils.h"
|
||||||
|
|
Loading…
Reference in a new issue