compile fix for 2.5 kdev_t compatibility macros

PATCH In review Stephen Lord 4 participants 6 messages Jun 28, 2002

lore

Share & tools

lore

Stephen Lord

author

2002-06-28 13:49 UTC #0 lore raw

PATCH 1/1 compile fix for 2.5 kdev_t compatibility macros

Marcelo,

We started using these for XFS, and found a missing bracket, patch against 2.4.19-rc1.

Steve

*** linux-2.4.19-rc1/include/linux/kdev_t.h Fri Jun 28 08:40:22 2002
--- linux/include/linux/kdev_t.h Fri Jun 28 07:05:32 2002
***************
*** 81,87 ****
#define minor(d) MINOR(d)
#define kdev_same(a,b) ((a) == (b))
#define kdev_none(d) (!(d))
! #define kdev_val(d) ((unsigned int)(d)
#define val_to_kdev(d) ((kdev_t(d))

/*
--- 81,87 ----
#define minor(d) MINOR(d)
#define kdev_same(a,b) ((a) == (b))
#define kdev_none(d) (!(d))
! #define kdev_val(d) ((unsigned int)(d))
#define val_to_kdev(d) ((kdev_t(d))

Steven Cole

2002-06-28 14:37 UTC #1 lore raw

Quoted 27 lines · Stephen Lord

Marcelo,
We started using these for XFS, and found a missing bracket, patch against 2.4.19-rc1.
Steve
*** linux-2.4.19-rc1/include/linux/kdev_t.h Fri Jun 28 08:40:22 2002
--- linux/include/linux/kdev_t.h Fri Jun 28 07:05:32 2002
***************
*** 81,87 ****
#define minor(d) MINOR(d)
#define kdev_same(a,b) ((a) == (b))
#define kdev_none(d) (!(d))
! #define kdev_val(d) ((unsigned int)(d)
#define val_to_kdev(d) ((kdev_t(d))
/*
--- 81,87 ----
#define minor(d) MINOR(d)
#define kdev_same(a,b) ((a) == (b))
#define kdev_none(d) (!(d))
! #define kdev_val(d) ((unsigned int)(d))
#define val_to_kdev(d) ((kdev_t(d))

Quoted 1 line

/*

That's an odd-looking patch. Is this what you meant?

Steven

include/linux/kdev_t.h renamed from include/linux/kdev_t.h.orig +1 -1

@@ -81,7 +81,7 @@
 #define minor(d)	MINOR(d)
 #define kdev_same(a,b)	((a) == (b))
 #define kdev_none(d)	(!(d))
-#define kdev_val(d)	((unsigned int)(d)
+#define kdev_val(d)	((unsigned int)(d))
 #define val_to_kdev(d)	((kdev_t(d))
 
 /*

Stephen Lord

author

2002-06-28 14:45 UTC #2 lore raw

Quoted 38 lines · Steven Cole

Quoted 27 lines · Stephen Lord
Marcelo,
We started using these for XFS, and found a missing bracket, patch against 2.4.19-rc1.
Steve
*** linux-2.4.19-rc1/include/linux/kdev_t.h Fri Jun 28 08:40:22 2002
--- linux/include/linux/kdev_t.h Fri Jun 28 07:05:32 2002
***************
*** 81,87 ****
#define minor(d) MINOR(d)
#define kdev_same(a,b) ((a) == (b))
#define kdev_none(d) (!(d))
! #define kdev_val(d) ((unsigned int)(d)
#define val_to_kdev(d) ((kdev_t(d))
/*
--- 81,87 ----
#define minor(d) MINOR(d)
#define kdev_same(a,b) ((a) == (b))
#define kdev_none(d) (!(d))
! #define kdev_val(d) ((unsigned int)(d))
#define val_to_kdev(d) ((kdev_t(d))
Quoted 1 line
/*
That's an odd-looking patch. Is this what you meant?
Steven

include/linux/kdev_t.h line 87

Quoted 8 lines

include/linux/kdev_t.h renamed from include/linux/kdev_t.h.orig +1 -1

@@ -81,7 +81,7 @@
 #define minor(d)	MINOR(d)
 #define kdev_same(a,b)	((a) == (b))
 #define kdev_none(d)	(!(d))
-#define kdev_val(d)	((unsigned int)(d)
+#define kdev_val(d)	((unsigned int)(d))
 #define val_to_kdev(d)	((kdev_t(d))
 
 /*

Yes, do not use diff before drinking coffee in the morning.

Steve

Andries Brouwer

2002-06-28 14:59 UTC #3 lore raw

Quoted 19 lines · Stephen Lord

Quoted 18 lines · Steven Cole
Quoted 6 lines · Stephen Lord
Marcelo,
We started using these for XFS, and found a missing bracket, patch against 2.4.19-rc1.
include/linux/kdev_t.h renamed from include/linux/kdev_t.h.orig +1 -1
@@ -81,7 +81,7 @@
 #define minor(d)	MINOR(d)
 #define kdev_same(a,b)	((a) == (b))
 #define kdev_none(d)	(!(d))
-#define kdev_val(d)	((unsigned int)(d)
+#define kdev_val(d)	((unsigned int)(d))
 #define val_to_kdev(d)	((kdev_t(d))
 

Quoted 1 line

include/linux/kdev_t.h line 87
Quoted 1 line
include/linux/kdev_t.h renamed from include/linux/kdev_t.h.orig +0 -0
 /*

But what about the next line?

Martin Josefsson

2002-06-28 15:07 UTC #4 lore raw

In reply to Steven Cole

On Fri, 2002-06-28 at 16:37, Steven Cole wrote:

[snip]

Quoted 7 lines

That's an odd-looking patch. Is this what you meant?
Steven

include/linux/kdev_t.h line 87

Quoted 8 lines

include/linux/kdev_t.h renamed from include/linux/kdev_t.h.orig +1 -1

@@ -81,7 +81,7 @@
 #define minor(d)	MINOR(d)
 #define kdev_same(a,b)	((a) == (b))
 #define kdev_none(d)	(!(d))
-#define kdev_val(d)	((unsigned int)(d)
+#define kdev_val(d)	((unsigned int)(d))
 #define val_to_kdev(d)	((kdev_t(d))
 
 /*

And here's one more...

include/linux/kdev_t.h renamed from include/linux/kdev_t.h.orig +1 -1

@@ -82,7 +82,7 @@
 #define kdev_same(a,b)	((a) == (b))
 #define kdev_none(d)	(!(d))
 #define kdev_val(d)	((unsigned int)(d))
-#define val_to_kdev(d)	((kdev_t(d))
+#define val_to_kdev(d)	(kdev_t(d))
 
 /*
 As long as device numbers in the outside world have 16 bits only,

Signature · 4 lines

/Martin

Never argue with an idiot. They drag you down to their level, then beat
you with experience.

Steven Cole

2002-06-28 15:24 UTC #5 lore raw

On Fri, 2002-06-28 at 09:10, Martin Josefsson wrote:
[snip]

Quoted 18 lines

And here's one more...

include/linux/kdev_t.h renamed from include/linux/kdev_t.h.orig +1 -1

@@ -82,7 +82,7 @@
 #define kdev_same(a,b)	((a) == (b))
 #define kdev_none(d)	(!(d))
 #define kdev_val(d)	((unsigned int)(d))
-#define val_to_kdev(d)	((kdev_t(d))
+#define val_to_kdev(d)	(kdev_t(d))
 
 /*
 As long as device numbers in the outside world have 16 bits only,

Signature · 2 lines

-- 
/Martin

Hmm. It looks like (d) should be cast to (kdev_t). Here are both fixes (I hope).

Steven

include/linux/kdev_t.h renamed from include/linux/kdev_t.h.orig +2 -2

@@ -81,8 +81,8 @@
 #define minor(d)	MINOR(d)
 #define kdev_same(a,b)	((a) == (b))
 #define kdev_none(d)	(!(d))
-#define kdev_val(d)	((unsigned int)(d)
-#define val_to_kdev(d)	((kdev_t(d))
+#define kdev_val(d)	((unsigned int)(d))
+#define val_to_kdev(d)	((kdev_t)(d))
 
 /*
 As long as device numbers in the outside world have 16 bits only,