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

Commit a0b0b8a5 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Christoph Hellwig
Browse files

xfs: kill mutex_t typedef 



People continue to complain about this for weird reasons, but there's
really no point in keeping this typedef for a couple of users anyway.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarEric Sandeen <sandeen@sandeen.net>
Reviewed-by: default avatarFelix Blyakher <felixb@sgi.com>
parent 61454f33

fs/xfs/linux-2.6/mutex.h

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

 * Copyright (c) 2000-2003,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_MUTEX_H__

#define __XFS_SUPPORT_MUTEX_H__



#include <linux/mutex.h>



typedef struct mutex mutex_t;



#endif /* __XFS_SUPPORT_MUTEX_H__ */

fs/xfs/linux-2.6/xfs_linux.h

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,6 @@ 
#include <kmem.h>

#include <mrlock.h>

#include <sv.h>

#include <mutex.h>

#include <time.h>



#include <support/ktrace.h>
@@ -51,6 +50,7 @@ 
#include <linux/blkdev.h>

#include <linux/slab.h>

#include <linux/module.h>

#include <linux/mutex.h>

#include <linux/file.h>

#include <linux/swap.h>

#include <linux/errno.h>

fs/xfs/quota/xfs_dquot.h

+2 −2
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ 
 */

typedef struct xfs_dqhash {

	struct xfs_dquot *qh_next;

	mutex_t		  qh_lock;

	struct mutex	  qh_lock;

	uint		  qh_version;	/* ever increasing version */

	uint		  qh_nelems;	/* number of dquots on the list */

} xfs_dqhash_t;
@@ -81,7 +81,7 @@ typedef struct xfs_dquot { 
	xfs_qcnt_t	 q_res_bcount;	/* total regular nblks used+reserved */

	xfs_qcnt_t	 q_res_icount;	/* total inos allocd+reserved */

	xfs_qcnt_t	 q_res_rtbcount;/* total realtime blks used+reserved */

	mutex_t		 q_qlock;	/* quota lock */

	struct mutex	 q_qlock;	/* quota lock */

	struct completion q_flush;	/* flush completion queue */

	atomic_t          q_pincount;	/* dquot pin count */

	wait_queue_head_t q_pinwait;	/* dquot pinning wait queue */

fs/xfs/quota/xfs_qm.c

+2 −2
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ 
 * quota functionality, including maintaining the freelist and hash

 * tables of dquots.

 */

mutex_t		xfs_Gqm_lock;

struct mutex	xfs_Gqm_lock;

struct xfs_qm	*xfs_Gqm;

uint		ndquot;
@@ -80,7 +80,7 @@ static struct shrinker xfs_qm_shaker = { 
};



#ifdef DEBUG

extern mutex_t	qcheck_lock;

extern struct mutex	qcheck_lock;

#endif



#ifdef QUOTADEBUG

fs/xfs/quota/xfs_qm.h

+3 −3
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ struct xfs_qm; 
struct xfs_inode;



extern uint		ndquot;

extern mutex_t		xfs_Gqm_lock;

extern struct mutex	xfs_Gqm_lock;

extern struct xfs_qm	*xfs_Gqm;

extern kmem_zone_t	*qm_dqzone;

extern kmem_zone_t	*qm_dqtrxzone;
@@ -79,7 +79,7 @@ typedef xfs_dqhash_t xfs_dqlist_t; 
typedef struct xfs_frlist {

       struct xfs_dquot *qh_next;

       struct xfs_dquot *qh_prev;

       mutex_t		 qh_lock;

       struct mutex	 qh_lock;

       uint		 qh_version;

       uint		 qh_nelems;

} xfs_frlist_t;
@@ -115,7 +115,7 @@ typedef struct xfs_quotainfo { 
	xfs_qwarncnt_t	 qi_bwarnlimit;	 /* limit for blks warnings */

	xfs_qwarncnt_t	 qi_iwarnlimit;	 /* limit for inodes warnings */

	xfs_qwarncnt_t	 qi_rtbwarnlimit;/* limit for rt blks warnings */

	mutex_t		 qi_quotaofflock;/* to serialize quotaoff */

	struct mutex	 qi_quotaofflock;/* to serialize quotaoff */

	xfs_filblks_t	 qi_dqchunklen;	 /* # BBs in a chunk of dqs */

	uint		 qi_dqperchunk;	 /* # ondisk dqs in above chunk */

	xfs_qcnt_t	 qi_bhardlimit;	 /* default data blk hard limit */