Brice Goglin <[email protected]> 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
-
_
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[Index of Archives]
[Kernel Newbies]
[Netfilter]
[Bugtraq]
[Photo]
[Stuff]
[Gimp]
[Yosemite News]
[MIPS Linux]
[ARM Linux]
[Linux Security]
[Linux RAID]
[Video 4 Linux]
[Linux for the blind]
[Linux Resources]
