Messages in this thread Patch in this message | | | Date | Thu, 26 May 2005 01:58:48 +0200 | From | Brice Goglin <> | Subject | Re: dlm-lockspaces-callbacks-directory-fix.patch added to -mm tree |
| |
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 --- 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 | |