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

Commit 007c61c6 authored by Eric Sandeen's avatar Eric Sandeen Committed by Lachlan McIlroy
Browse files

[XFS] Remove spin.h 



remove spinlock init abstraction macro in spin.h, remove the callers, and
remove the file. Move no-op spinlock_destroy to xfs_linux.h Cleanup
spinlock locals in xfs_mount.c

SGI-PV: 970382
SGI-Modid: xfs-linux-melb:xfs-kern:29751a

Signed-off-by: default avatarEric Sandeen <sandeen@sandeen.net>
Signed-off-by: default avatarDonald Douwsma <donaldd@sgi.com>
Signed-off-by: default avatarLachlan McIlroy <lachlan@sgi.com>
Signed-off-by: default avatarTim Shimmin <tes@sgi.com>
parent 36e41eeb

fs/xfs/linux-2.6/spin.h

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

 * Copyright (c) 2000-2002,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_SUPPORT_SPIN_H__

#define __XFS_SUPPORT_SPIN_H__



#include <linux/sched.h>	/* preempt needs this */

#include <linux/spinlock.h>



#define spinlock_init(lock, name)	spin_lock_init(lock)

#define	spinlock_destroy(lock)



#endif /* __XFS_SUPPORT_SPIN_H__ */

fs/xfs/linux-2.6/xfs_buf.c

+1 −1
Original line number Diff line number Diff line
@@ -1572,7 +1572,7 @@ xfs_alloc_delwrite_queue( 


	INIT_LIST_HEAD(&btp->bt_list);

	INIT_LIST_HEAD(&btp->bt_delwrite_queue);

	spinlock_init(&btp->bt_delwrite_lock, "delwri_lock");

	spin_lock_init(&btp->bt_delwrite_lock);

	btp->bt_flags = 0;

	btp->bt_task = kthread_run(xfsbufd, btp, "xfsbufd");

	if (IS_ERR(btp->bt_task)) {

fs/xfs/linux-2.6/xfs_linux.h

+3 −1
Original line number Diff line number Diff line
@@ -43,7 +43,6 @@ 


#include <kmem.h>

#include <mrlock.h>

#include <spin.h>

#include <sv.h>

#include <mutex.h>

#include <sema.h>
@@ -75,6 +74,7 @@ 
#include <linux/notifier.h>

#include <linux/delay.h>

#include <linux/log2.h>

#include <linux/spinlock.h>



#include <asm/page.h>

#include <asm/div64.h>
@@ -136,6 +136,8 @@ 
#define current_restore_flags_nested(sp, f)	\

		(current->flags = ((current->flags & ~(f)) | (*(sp) & (f))))



#define spinlock_destroy(lock)



#define NBPP		PAGE_SIZE

#define NDPP		(1 << (PAGE_SHIFT - 9))

fs/xfs/quota/xfs_qm.c

+1 −1
Original line number Diff line number Diff line
@@ -1138,7 +1138,7 @@ xfs_qm_init_quotainfo( 
		return error;

	}



	spinlock_init(&qinf->qi_pinlock, "xfs_qinf_pin");

	spin_lock_init(&qinf->qi_pinlock);

	xfs_qm_list_init(&qinf->qi_dqlist, "mpdqlist", 0);

	qinf->qi_dqreclaims = 0;

fs/xfs/support/debug.c

+0 −1
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
 */

#include <xfs.h>

#include "debug.h"

#include "spin.h"



static char		message[1024];	/* keep it off the stack */

static DEFINE_SPINLOCK(xfs_err_lock);