Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b267ce99 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Tim Shimmin
Browse files

[XFS] kill struct bhv_vfs 



Now that struct bhv_vfs doesn't have any members left we can kill it and
go directly from the super_block to the xfs_mount everywhere.

SGI-PV: 969608
SGI-Modid: xfs-linux-melb:xfs-kern:29509a

Signed-off-by: default avatarChristoph Hellwig <hch@infradead.org>
Signed-off-by: default avatarDavid Chinner <dgc@sgi.com>
Signed-off-by: default avatarTim Shimmin <tes@sgi.com>
parent 74394496

fs/xfs/Makefile-linux-2.6

+0 −1
Original line number Diff line number Diff line
@@ -107,7 +107,6 @@ xfs-y += $(addprefix $(XFS_LINUX)/, \ 
				   xfs_iops.o \

				   xfs_lrw.o \

				   xfs_super.o \

				   xfs_vfs.o \

				   xfs_vnode.o)



# Objects in support/

fs/xfs/linux-2.6/xfs_lrw.c

+1 −1
Original line number Diff line number Diff line
@@ -621,7 +621,7 @@ xfs_write( 
	io = &xip->i_iocore;

	mp = io->io_mount;



	vfs_wait_for_freeze(XFS_MTOVFS(mp), SB_FREEZE_WRITE);

	xfs_wait_for_freeze(mp, SB_FREEZE_WRITE);



	if (XFS_FORCED_SHUTDOWN(mp))

		return -EIO;

fs/xfs/linux-2.6/xfs_super.c

+4 −11
Original line number Diff line number Diff line
@@ -511,7 +511,7 @@ xfs_flush_device_work( 
	void		*arg)

{

	struct inode	*inode = arg;

	sync_blockdev(mp->m_vfsp->vfs_super->s_bdev);

	sync_blockdev(mp->m_super->s_bdev);

	iput(inode);

}
@@ -593,7 +593,6 @@ STATIC void 
xfs_fs_put_super(

	struct super_block	*sb)

{

	bhv_vfs_t		*vfsp = vfs_from_sb(sb);

	struct xfs_mount	*mp = XFS_M(sb);

	int			error;
@@ -601,12 +600,8 @@ xfs_fs_put_super( 


	xfs_sync(mp, SYNC_ATTR | SYNC_DELWRI);

	error = xfs_unmount(mp, 0, NULL);

	if (error) {

	if (error)

		printk("XFS: unmount got error=%d\n", error);

		printk("%s: vfs=0x%p left dangling!\n", __FUNCTION__, vfsp);

	} else {

		vfs_deallocate(vfsp);

	}

}



STATIC void
@@ -764,7 +759,6 @@ xfs_fs_fill_super( 
	int			silent)

{

	struct inode		*rootvp;

	struct bhv_vfs		*vfsp = vfs_allocate(sb);

	struct xfs_mount	*mp = NULL;

	struct xfs_mount_args	*args = xfs_args_allocate(sb, silent);

	struct kstatfs		statvfs;
@@ -776,8 +770,8 @@ xfs_fs_fill_super( 
	spin_lock_init(&mp->m_sync_lock);

	init_waitqueue_head(&mp->m_wait_single_sync_task);



	mp->m_vfsp = vfsp;

	vfsp->vfs_mount = mp;

	mp->m_super = sb;

	sb->s_fs_info = mp;



	if (sb->s_flags & MS_RDONLY)

		mp->m_flags |= XFS_MOUNT_RDONLY;
@@ -847,7 +841,6 @@ xfs_fs_fill_super( 
	xfs_unmount(mp, 0, NULL);



fail_vfsop:

	vfs_deallocate(vfsp);

	kmem_free(args, sizeof(*args));

	return -error;

}

fs/xfs/linux-2.6/xfs_super.h

+1 −2
Original line number Diff line number Diff line
@@ -120,7 +120,6 @@ extern void xfs_blkdev_issue_flush(struct xfs_buftarg *); 


extern struct export_operations xfs_export_operations;



#define XFS_M(sb) \

	XFS_VFSTOM(vfs_from_sb(sb))

#define XFS_M(sb)		((struct xfs_mount *)((sb)->s_fs_info))



#endif	/* __XFS_SUPER_H__ */

fs/xfs/linux-2.6/xfs_vfs.c

deleted100644 → 0
+0 −226
Original line number Diff line number Diff line 
/*

 * 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

 */

#include "xfs.h"

#include "xfs_fs.h"

#include "xfs_inum.h"

#include "xfs_log.h"

#include "xfs_clnt.h"

#include "xfs_trans.h"

#include "xfs_sb.h"

#include "xfs_ag.h"

#include "xfs_dir2.h"

#include "xfs_imap.h"

#include "xfs_alloc.h"

#include "xfs_dmapi.h"

#include "xfs_mount.h"

#include "xfs_quota.h"



int

vfs_mount(

	struct bhv_desc		*bdp,

	struct xfs_mount_args	*args,

	struct cred		*cr)

{

	struct bhv_desc		*next = bdp;



	ASSERT(next);

	while (! (bhvtovfsops(next))->vfs_mount)

		next = BHV_NEXT(next);

	return ((*bhvtovfsops(next)->vfs_mount)(next, args, cr));

}



int

vfs_parseargs(

	struct bhv_desc		*bdp,

	char			*s,

	struct xfs_mount_args	*args,

	int			f)

{

	struct bhv_desc		*next = bdp;



	ASSERT(next);

	while (! (bhvtovfsops(next))->vfs_parseargs)

		next = BHV_NEXT(next);

	return ((*bhvtovfsops(next)->vfs_parseargs)(next, s, args, f));

}



int

vfs_showargs(

	struct bhv_desc		*bdp,

	struct seq_file		*m)

{

	struct bhv_desc		*next = bdp;



	ASSERT(next);

	while (! (bhvtovfsops(next))->vfs_showargs)

		next = BHV_NEXT(next);

	return ((*bhvtovfsops(next)->vfs_showargs)(next, m));

}



int

vfs_unmount(

	struct bhv_desc		*bdp,

	int			fl,

	struct cred		*cr)

{

	struct bhv_desc		*next = bdp;



	ASSERT(next);

	while (! (bhvtovfsops(next))->vfs_unmount)

		next = BHV_NEXT(next);

	return ((*bhvtovfsops(next)->vfs_unmount)(next, fl, cr));

}



int

vfs_mntupdate(

	struct bhv_desc		*bdp,

	int			*fl,

	struct xfs_mount_args	*args)

{

	struct bhv_desc		*next = bdp;



	ASSERT(next);

	while (! (bhvtovfsops(next))->vfs_mntupdate)

		next = BHV_NEXT(next);

	return ((*bhvtovfsops(next)->vfs_mntupdate)(next, fl, args));

}



int

vfs_root(

	struct bhv_desc		*bdp,

	bhv_vnode_t		**vpp)

{

	struct bhv_desc		*next = bdp;



	ASSERT(next);

	while (! (bhvtovfsops(next))->vfs_root)

		next = BHV_NEXT(next);

	return ((*bhvtovfsops(next)->vfs_root)(next, vpp));

}



int

vfs_statvfs(

	struct bhv_desc		*bdp,

	bhv_statvfs_t		*statp,

	bhv_vnode_t		*vp)

{

	struct bhv_desc		*next = bdp;



	ASSERT(next);

	while (! (bhvtovfsops(next))->vfs_statvfs)

		next = BHV_NEXT(next);

	return ((*bhvtovfsops(next)->vfs_statvfs)(next, statp, vp));

}



int

vfs_sync(

	struct bhv_desc		*bdp,

	int			fl,

	struct cred		*cr)

{

	struct bhv_desc		*next = bdp;



	ASSERT(next);

	while (! (bhvtovfsops(next))->vfs_sync)

		next = BHV_NEXT(next);

	return ((*bhvtovfsops(next)->vfs_sync)(next, fl, cr));

}



int

vfs_vget(

	struct bhv_desc		*bdp,

	bhv_vnode_t		**vpp,

	struct fid		*fidp)

{

	struct bhv_desc		*next = bdp;



	ASSERT(next);

	while (! (bhvtovfsops(next))->vfs_vget)

		next = BHV_NEXT(next);

	return ((*bhvtovfsops(next)->vfs_vget)(next, vpp, fidp));

}



void

vfs_init_vnode(

	struct bhv_desc		*bdp,

	bhv_vnode_t		*vp,

	struct xfs_inode	*ip,

	int			unlock)

{

	struct bhv_desc		*next = bdp;



	ASSERT(next);

	while (! (bhvtovfsops(next))->vfs_init_vnode)

		next = BHV_NEXT(next);

	((*bhvtovfsops(next)->vfs_init_vnode)(next, vp, ip, unlock));

}



void

vfs_force_shutdown(

	struct bhv_desc		*bdp,

	int			fl,

	char			*file,

	int			line)

{

	struct bhv_desc		*next = bdp;



	ASSERT(next);

	while (! (bhvtovfsops(next))->vfs_force_shutdown)

		next = BHV_NEXT(next);

	((*bhvtovfsops(next)->vfs_force_shutdown)(next, fl, file, line));

}



void

vfs_freeze(

	struct bhv_desc		*bdp)

{

	struct bhv_desc		*next = bdp;



	ASSERT(next);

	while (! (bhvtovfsops(next))->vfs_freeze)

		next = BHV_NEXT(next);

	((*bhvtovfsops(next)->vfs_freeze)(next));

}



bhv_vfs_t *

vfs_allocate(

	struct super_block	*sb)

{

	struct bhv_vfs		*vfsp;



	vfsp = kmem_zalloc(sizeof(bhv_vfs_t), KM_SLEEP);



	vfsp->vfs_super = sb;

	sb->s_fs_info = vfsp;



	return vfsp;

}



bhv_vfs_t *

vfs_from_sb(

	struct super_block	*sb)

{

	return (bhv_vfs_t *)sb->s_fs_info;

}



void

vfs_deallocate(

	struct bhv_vfs		*vfsp)

{

	kmem_free(vfsp, sizeof(bhv_vfs_t));

}