* Re: dlm-lockspaces-callbacks-directory-fix.patch added to -mm tree
[not found] <200505252249.j4PMnN4q021004@shell0.pdx.osdl.net>
@ 2005-05-25 22:07 ` Alexandre Buisse
2005-05-25 23:23 ` Andrew Morton
0 siblings, 1 reply; 5+ messages in thread
From: Alexandre Buisse @ 2005-05-25 22:07 UTC (permalink / raw)
To: akpm; +Cc: linux-kernel, pcaulfie, teigland
akpm@osdl.org wrote:
> The patch titled
>
> dlm build fix
>
> has been added to the -mm tree. Its filename is
>
> dlm-lockspaces-callbacks-directory-fix.patch
>
> Patches currently in -mm which might be from alexandre.buisse@ens-lyon.fr are
>
> dlm-lockspaces-callbacks-directory-fix.patch
Hi Andrew,
I just noticed that the line 'extern const int
dlm_lvb_operations[8][8];' had been removed in the inline patch you just
mailed.
Sorry for not making it clear in my first mail, but that definition is
needed with CONFIG_DLM_DEVICE=y. Without it, the build fails at line 362
in drivers/dlm/device.c.
Regards,
Alexandre
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: dlm-lockspaces-callbacks-directory-fix.patch added to -mm tree
2005-05-25 22:07 ` dlm-lockspaces-callbacks-directory-fix.patch added to -mm tree Alexandre Buisse
@ 2005-05-25 23:23 ` Andrew Morton
2005-05-25 23:58 ` Brice Goglin
0 siblings, 1 reply; 5+ messages in thread
From: Andrew Morton @ 2005-05-25 23:23 UTC (permalink / raw)
To: Alexandre Buisse; +Cc: linux-kernel, pcaulfie, teigland
Alexandre Buisse <alexandre.buisse@ens-lyon.fr> wrote:
>
> I just noticed that the line 'extern const int
> dlm_lvb_operations[8][8];' had been removed in the inline patch you just
> mailed.
? I see not such removal.
diff -puN drivers/dlm/lock.c~dlm-lockspaces-callbacks-directory-fix drivers/dlm/lock.c
--- 25/drivers/dlm/lock.c~dlm-lockspaces-callbacks-directory-fix Wed May 25 15:49:54 2005
+++ 25-akpm/drivers/dlm/lock.c Wed May 25 15:49:54 2005
@@ -104,6 +104,29 @@ const int __dlm_compat_matrix[8][8] = {
{0, 0, 0, 0, 0, 0, 0, 0} /* PD */
};
+/*
+ * This defines the direction of transfer of LVB data.
+ * Granted mode is the row; requested mode is the column.
+ * Usage: matrix[grmode+1][rqmode+1]
+ * 1 = LVB is returned to the caller
+ * 0 = LVB is written to the resource
+ * -1 = nothing happens to the LVB
+ */
+
+
+const int dlm_lvb_operations[8][8] = {
+ /* UN NL CR CW PR PW EX PD*/
+ { -1, 1, 1, 1, 1, 1, 1, -1 }, /* UN */
+ { -1, 1, 1, 1, 1, 1, 1, 0 }, /* NL */
+ { -1, -1, 1, 1, 1, 1, 1, 0 }, /* CR */
+ { -1, -1, -1, 1, 1, 1, 1, 0 }, /* CW */
+ { -1, -1, -1, -1, 1, 1, 1, 0 }, /* PR */
+ { -1, 0, 0, 0, 0, 0, 1, 0 }, /* PW */
+ { -1, 0, 0, 0, 0, 0, 0, 0 }, /* EX */
+ { -1, 0, 0, 0, 0, 0, 0, 0 } /* PD */
+};
+
+
#define modes_compat(gr, rq) \
__dlm_compat_matrix[(gr)->lkb_grmode + 1][(rq)->lkb_rqmode + 1]
diff -puN drivers/dlm/lvb_table.h~dlm-lockspaces-callbacks-directory-fix drivers/dlm/lvb_table.h
--- 25/drivers/dlm/lvb_table.h~dlm-lockspaces-callbacks-directory-fix Wed May 25 15:49:54 2005
+++ 25-akpm/drivers/dlm/lvb_table.h Wed May 25 15:49:54 2005
@@ -13,26 +13,4 @@
#ifndef __LVB_TABLE_DOT_H__
#define __LVB_TABLE_DOT_H__
-/*
- * This defines the direction of transfer of LVB data.
- * Granted mode is the row; requested mode is the column.
- * Usage: matrix[grmode+1][rqmode+1]
- * 1 = LVB is returned to the caller
- * 0 = LVB is written to the resource
- * -1 = nothing happens to the LVB
- */
-
-const int dlm_lvb_operations[8][8] = {
- /* UN NL CR CW PR PW EX PD*/
- { -1, 1, 1, 1, 1, 1, 1, -1 }, /* UN */
- { -1, 1, 1, 1, 1, 1, 1, 0 }, /* NL */
- { -1, -1, 1, 1, 1, 1, 1, 0 }, /* CR */
- { -1, -1, -1, 1, 1, 1, 1, 0 }, /* CW */
- { -1, -1, -1, -1, 1, 1, 1, 0 }, /* PR */
- { -1, 0, 0, 0, 0, 0, 1, 0 }, /* PW */
- { -1, 0, 0, 0, 0, 0, 0, 0 }, /* EX */
- { -1, 0, 0, 0, 0, 0, 0, 0 } /* PD */
-};
-
#endif
-
_
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: dlm-lockspaces-callbacks-directory-fix.patch added to -mm tree
2005-05-25 23:23 ` Andrew Morton
@ 2005-05-25 23:58 ` Brice Goglin
2005-05-26 0:25 ` Andrew Morton
0 siblings, 1 reply; 5+ messages in thread
From: Brice Goglin @ 2005-05-25 23:58 UTC (permalink / raw)
To: Andrew Morton; +Cc: Alexandre Buisse, linux-kernel, pcaulfie, teigland
[-- Attachment #1: Type: text/plain, Size: 782 bytes --]
Andrew Morton a écrit :
> Alexandre Buisse <alexandre.buisse@ens-lyon.fr> wrote:
>
>>I just noticed that the line 'extern const int
>>dlm_lvb_operations[8][8];' had been removed in the inline patch you just
>>mailed.
>
>
> ? I see not such removal.
Looks like Alexandre's patch was damaged by mistake.
An 'extern' appeared in the removed part of lvb_table.h
I guess the patch didn't actually apply to your tree.
This would explain why the lvb_table.h part of the version
you commited to -mm is different.
The attached patch should be good.
Note that dlm_lvb_operations is kept exported in lvb_table.h
so that drivers/dlm/device.c uses it. That was the point of
Alexandre's initial bug report: dlm_lvm_operations was defined
twice when both DLM and DLM_DEVICE are set.
Brice
[-- Attachment #2: fix-dlm-extern-lvb_table.patch --]
[-- Type: text/x-patch, Size: 1116 bytes --]
--- linux-2.6.12-rc5-mm1/drivers/dlm/lvb_table.h.old 2005-05-25 23:30:34.000000000 +0200
+++ linux-2.6.12-rc5-mm1/drivers/dlm/lvb_table.h 2005-05-25 23:32:35.000000000 +0200
@@ -13,26 +13,7 @@
#ifndef __LVB_TABLE_DOT_H__
#define __LVB_TABLE_DOT_H__
-/*
- * This defines the direction of transfer of LVB data.
- * Granted mode is the row; requested mode is the column.
- * Usage: matrix[grmode+1][rqmode+1]
- * 1 = LVB is returned to the caller
- * 0 = LVB is written to the resource
- * -1 = nothing happens to the LVB
- */
-
-const int dlm_lvb_operations[8][8] = {
- /* UN NL CR CW PR PW EX PD*/
- { -1, 1, 1, 1, 1, 1, 1, -1 }, /* UN */
- { -1, 1, 1, 1, 1, 1, 1, 0 }, /* NL */
- { -1, -1, 1, 1, 1, 1, 1, 0 }, /* CR */
- { -1, -1, -1, 1, 1, 1, 1, 0 }, /* CW */
- { -1, -1, -1, -1, 1, 1, 1, 0 }, /* PR */
- { -1, 0, 0, 0, 0, 0, 1, 0 }, /* PW */
- { -1, 0, 0, 0, 0, 0, 0, 0 }, /* EX */
- { -1, 0, 0, 0, 0, 0, 0, 0 } /* PD */
-};
+extern const int dlm_lvb_operations[8][8];
#endif
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: dlm-lockspaces-callbacks-directory-fix.patch added to -mm tree
2005-05-25 23:58 ` Brice Goglin
@ 2005-05-26 0:25 ` Andrew Morton
2005-05-26 6:09 ` Brice Goglin
0 siblings, 1 reply; 5+ messages in thread
From: Andrew Morton @ 2005-05-26 0:25 UTC (permalink / raw)
To: Brice.Goglin
Cc: Brice.Goglin, alexandre.buisse, linux-kernel, pcaulfie, teigland
Brice Goglin <Brice.Goglin@ens-lyon.fr> wrote:
>
> Looks like Alexandre's patch was damaged by mistake.
> An 'extern' appeared in the removed part of lvb_table.h
> I guess the patch didn't actually apply to your tree.
> This would explain why the lvb_table.h part of the version
> you commited to -mm is different.
>
> The attached patch should be good.
>
> Note that dlm_lvb_operations is kept exported in lvb_table.h
> so that drivers/dlm/device.c uses it. That was the point of
> Alexandre's initial bug report: dlm_lvm_operations was defined
> twice when both DLM and DLM_DEVICE are set.
OK, thanks. Here's what I currently have:
--- 25/drivers/dlm/lock.c~dlm-lockspaces-callbacks-directory-fix Wed May 25 16:23:04 2005
+++ 25-akpm/drivers/dlm/lock.c Wed May 25 17:24:08 2005
@@ -104,6 +104,26 @@ const int __dlm_compat_matrix[8][8] = {
{0, 0, 0, 0, 0, 0, 0, 0} /* PD */
};
+/*
+ * This defines the direction of transfer of LVB data.
+ * Granted mode is the row; requested mode is the column.
+ * Usage: matrix[grmode+1][rqmode+1]
+ * 1 = LVB is returned to the caller
+ * 0 = LVB is written to the resource
+ * -1 = nothing happens to the LVB
+ */
+const int dlm_lvb_operations[8][8] = {
+ /* UN NL CR CW PR PW EX PD*/
+ { -1, 1, 1, 1, 1, 1, 1, -1 }, /* UN */
+ { -1, 1, 1, 1, 1, 1, 1, 0 }, /* NL */
+ { -1, -1, 1, 1, 1, 1, 1, 0 }, /* CR */
+ { -1, -1, -1, 1, 1, 1, 1, 0 }, /* CW */
+ { -1, -1, -1, -1, 1, 1, 1, 0 }, /* PR */
+ { -1, 0, 0, 0, 0, 0, 1, 0 }, /* PW */
+ { -1, 0, 0, 0, 0, 0, 0, 0 }, /* EX */
+ { -1, 0, 0, 0, 0, 0, 0, 0 } /* PD */
+};
+
#define modes_compat(gr, rq) \
__dlm_compat_matrix[(gr)->lkb_grmode + 1][(rq)->lkb_rqmode + 1]
diff -puN drivers/dlm/lvb_table.h~dlm-lockspaces-callbacks-directory-fix drivers/dlm/lvb_table.h
--- 25/drivers/dlm/lvb_table.h~dlm-lockspaces-callbacks-directory-fix Wed May 25 16:23:04 2005
+++ 25-akpm/drivers/dlm/lvb_table.h Wed May 25 17:24:17 2005
@@ -13,26 +13,6 @@
#ifndef __LVB_TABLE_DOT_H__
#define __LVB_TABLE_DOT_H__
-/*
- * This defines the direction of transfer of LVB data.
- * Granted mode is the row; requested mode is the column.
- * Usage: matrix[grmode+1][rqmode+1]
- * 1 = LVB is returned to the caller
- * 0 = LVB is written to the resource
- * -1 = nothing happens to the LVB
- */
-
-const int dlm_lvb_operations[8][8] = {
- /* UN NL CR CW PR PW EX PD*/
- { -1, 1, 1, 1, 1, 1, 1, -1 }, /* UN */
- { -1, 1, 1, 1, 1, 1, 1, 0 }, /* NL */
- { -1, -1, 1, 1, 1, 1, 1, 0 }, /* CR */
- { -1, -1, -1, 1, 1, 1, 1, 0 }, /* CW */
- { -1, -1, -1, -1, 1, 1, 1, 0 }, /* PR */
- { -1, 0, 0, 0, 0, 0, 1, 0 }, /* PW */
- { -1, 0, 0, 0, 0, 0, 0, 0 }, /* EX */
- { -1, 0, 0, 0, 0, 0, 0, 0 } /* PD */
-};
+extern const int dlm_lvb_operations[8][8];
#endif
-
_
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: dlm-lockspaces-callbacks-directory-fix.patch added to -mm tree
2005-05-26 0:25 ` Andrew Morton
@ 2005-05-26 6:09 ` Brice Goglin
0 siblings, 0 replies; 5+ messages in thread
From: Brice Goglin @ 2005-05-26 6:09 UTC (permalink / raw)
To: Andrew Morton; +Cc: alexandre.buisse, linux-kernel, pcaulfie, teigland
This one looks good.
Regards,
Brice
Andrew Morton a écrit :
> Brice Goglin <Brice.Goglin@ens-lyon.fr> wrote:
>
>>Looks like Alexandre's patch was damaged by mistake.
>>An 'extern' appeared in the removed part of lvb_table.h
>>I guess the patch didn't actually apply to your tree.
>>This would explain why the lvb_table.h part of the version
>>you commited to -mm is different.
>>
>>The attached patch should be good.
>>
>>Note that dlm_lvb_operations is kept exported in lvb_table.h
>>so that drivers/dlm/device.c uses it. That was the point of
>>Alexandre's initial bug report: dlm_lvm_operations was defined
>>twice when both DLM and DLM_DEVICE are set.
>
>
> OK, thanks. Here's what I currently have:
>
> --- 25/drivers/dlm/lock.c~dlm-lockspaces-callbacks-directory-fix Wed May 25 16:23:04 2005
> +++ 25-akpm/drivers/dlm/lock.c Wed May 25 17:24:08 2005
> @@ -104,6 +104,26 @@ const int __dlm_compat_matrix[8][8] = {
> {0, 0, 0, 0, 0, 0, 0, 0} /* PD */
> };
>
> +/*
> + * This defines the direction of transfer of LVB data.
> + * Granted mode is the row; requested mode is the column.
> + * Usage: matrix[grmode+1][rqmode+1]
> + * 1 = LVB is returned to the caller
> + * 0 = LVB is written to the resource
> + * -1 = nothing happens to the LVB
> + */
> +const int dlm_lvb_operations[8][8] = {
> + /* UN NL CR CW PR PW EX PD*/
> + { -1, 1, 1, 1, 1, 1, 1, -1 }, /* UN */
> + { -1, 1, 1, 1, 1, 1, 1, 0 }, /* NL */
> + { -1, -1, 1, 1, 1, 1, 1, 0 }, /* CR */
> + { -1, -1, -1, 1, 1, 1, 1, 0 }, /* CW */
> + { -1, -1, -1, -1, 1, 1, 1, 0 }, /* PR */
> + { -1, 0, 0, 0, 0, 0, 1, 0 }, /* PW */
> + { -1, 0, 0, 0, 0, 0, 0, 0 }, /* EX */
> + { -1, 0, 0, 0, 0, 0, 0, 0 } /* PD */
> +};
> +
> #define modes_compat(gr, rq) \
> __dlm_compat_matrix[(gr)->lkb_grmode + 1][(rq)->lkb_rqmode + 1]
>
> diff -puN drivers/dlm/lvb_table.h~dlm-lockspaces-callbacks-directory-fix drivers/dlm/lvb_table.h
> --- 25/drivers/dlm/lvb_table.h~dlm-lockspaces-callbacks-directory-fix Wed May 25 16:23:04 2005
> +++ 25-akpm/drivers/dlm/lvb_table.h Wed May 25 17:24:17 2005
> @@ -13,26 +13,6 @@
> #ifndef __LVB_TABLE_DOT_H__
> #define __LVB_TABLE_DOT_H__
>
> -/*
> - * This defines the direction of transfer of LVB data.
> - * Granted mode is the row; requested mode is the column.
> - * Usage: matrix[grmode+1][rqmode+1]
> - * 1 = LVB is returned to the caller
> - * 0 = LVB is written to the resource
> - * -1 = nothing happens to the LVB
> - */
> -
> -const int dlm_lvb_operations[8][8] = {
> - /* UN NL CR CW PR PW EX PD*/
> - { -1, 1, 1, 1, 1, 1, 1, -1 }, /* UN */
> - { -1, 1, 1, 1, 1, 1, 1, 0 }, /* NL */
> - { -1, -1, 1, 1, 1, 1, 1, 0 }, /* CR */
> - { -1, -1, -1, 1, 1, 1, 1, 0 }, /* CW */
> - { -1, -1, -1, -1, 1, 1, 1, 0 }, /* PR */
> - { -1, 0, 0, 0, 0, 0, 1, 0 }, /* PW */
> - { -1, 0, 0, 0, 0, 0, 0, 0 }, /* EX */
> - { -1, 0, 0, 0, 0, 0, 0, 0 } /* PD */
> -};
> +extern const int dlm_lvb_operations[8][8];
>
> #endif
> -
> _
>
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2005-05-26 6:09 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <200505252249.j4PMnN4q021004@shell0.pdx.osdl.net>
2005-05-25 22:07 ` dlm-lockspaces-callbacks-directory-fix.patch added to -mm tree Alexandre Buisse
2005-05-25 23:23 ` Andrew Morton
2005-05-25 23:58 ` Brice Goglin
2005-05-26 0:25 ` Andrew Morton
2005-05-26 6:09 ` Brice Goglin
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.