Skip to contentSkip to conversation

remove flag-less mraccessf/mrupdatef

PATCH New Eric Sandeen 1 participant 1 message Nov 11, 2006

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 remove flag-less mraccessf/mrupdatef

mraccessf & mrupdatef are supposed to be the "flags" versions of the functions, but they

a) ignore the flags parameter completely, and
b) are never called directly, only via the flag-less defines anyway

So, drop the #define indirection, and rename mraccessf to mraccess, etc.

linux-2.4/mrlock.c       |    4 ++--
linux-2.4/mrlock_rwsem.h |    6 ++----
linux-2.6/mrlock.h       |    6 ++----
3 files changed, 6 insertions(+), 10 deletions(-)
linux-2.6/mrlock.h +0 -0
Index: xfs-linux-allpatches/linux-2.6/mrlock.h
===================================================================
@@ -31,15 +31,13 @@ typedef struct {
	do { (mrp)->mr_writer = 0; init_rwsem(&(mrp)->mr_lock); } while (0)

#define mrlock_init(mrp, t,n,s) mrinit(mrp, n)
#define mrfree(mrp) do { } while (0)
-#define mraccess(mrp) mraccessf(mrp, 0)
-#define mrupdate(mrp) mrupdatef(mrp, 0)

-static inline void mraccessf(mrlock_t *mrp, int flags) +static inline void mraccess(mrlock_t *mrp)

{
	down_read(&mrp->mr_lock);
}

-static inline void mrupdatef(mrlock_t *mrp, int flags) +static inline void mrupdate(mrlock_t *mrp)

{
	down_write(&mrp->mr_lock);
	mrp->mr_writer = 1;
linux-2.4/mrlock.c +0 -0
Index: xfs-linux-allpatches/linux-2.4/mrlock.c
===================================================================
@@ -116,7 +116,7 @@ mrlock(mrlock_t *mrp, int type, int flag
 

/* ARGSUSED */
void
-mraccessf(mrlock_t *mrp, int flags)
+mraccess(mrlock_t *mrp)

{
	MRLOCK(mrp);
	if(mrp->mr_writes_waiting > 0) {

@@ -135,7 +135,7 @@ mraccessf(mrlock_t *mrp, int flags)

/* ARGSUSED */
void
-mrupdatef(mrlock_t *mrp, int flags)
+mrupdate(mrlock_t *mrp)

{
	MRLOCK(mrp);
	while(mrp->mr_count) {
linux-2.4/mrlock_rwsem.h +0 -0
Index: xfs-linux-allpatches/linux-2.4/mrlock_rwsem.h
===================================================================
@@ -31,15 +31,13 @@ typedef struct {
	( (mrp)->mr_writer = 0, init_rwsem(&(mrp)->mr_lock) )

#define mrlock_init(mrp, t,n,s) mrinit(mrp, n)
#define mrfree(mrp) do { } while (0)
-#define mraccess(mrp) mraccessf(mrp, 0)
-#define mrupdate(mrp) mrupdatef(mrp, 0)

-static inline void mraccessf(mrlock_t *mrp, int flags) +static inline void mraccess(mrlock_t *mrp)

{
	down_read(&mrp->mr_lock);
}

-static inline void mrupdatef(mrlock_t *mrp, int flags) +static inline void mrupdate(mrlock_t *mrp)

{
	down_write(&mrp->mr_lock);
	mrp->mr_writer = 1;