From: Andrew Morton <akpm@osdl.org>
To: Alexandre Buisse <alexandre.buisse@ens-lyon.fr>
Cc: linux-kernel@vger.kernel.org, pcaulfie@redhat.com, teigland@redhat.com
Subject: Re: dlm-lockspaces-callbacks-directory-fix.patch added to -mm tree
Date: Wed, 25 May 2005 16:23:18 -0700 [thread overview]
Message-ID: <20050525162318.511cdc9b.akpm@osdl.org> (raw)
In-Reply-To: <4294F718.8040107@ens-lyon.fr>
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
-
_
next prev parent reply other threads:[~2005-05-25 23:22 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
[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 [this message]
2005-05-25 23:58 ` Brice Goglin
2005-05-26 0:25 ` Andrew Morton
2005-05-26 6:09 ` Brice Goglin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20050525162318.511cdc9b.akpm@osdl.org \
--to=akpm@osdl.org \
--cc=alexandre.buisse@ens-lyon.fr \
--cc=linux-kernel@vger.kernel.org \
--cc=pcaulfie@redhat.com \
--cc=teigland@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox