[Cluster-devel] [PATCH] DLM: use gfp_t

[Cluster-devel] [PATCH] DLM: use gfp_t

[Alexey Dobriyan]

Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
---

 fs/dlm/lowcomms.c |    6 +++---
 fs/dlm/lowcomms.h |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

--- a/fs/dlm/lowcomms.c
+++ b/fs/dlm/lowcomms.c
@@ -174,7 +174,7 @@ static int nodeid_to_addr(int nodeid, st
 	return 0;
 }
 
-static struct nodeinfo *nodeid2nodeinfo(int nodeid, int alloc)
+static struct nodeinfo *nodeid2nodeinfo(int nodeid, gfp_t alloc)
 {
 	struct nodeinfo *ni;
 	int r;
@@ -726,7 +726,7 @@ static int init_sock(void)
 }
 
 
-static struct writequeue_entry *new_writequeue_entry(int allocation)
+static struct writequeue_entry *new_writequeue_entry(gfp_t allocation)
 {
 	struct writequeue_entry *entry;
 
@@ -748,7 +748,7 @@ static struct writequeue_entry *new_writ
 	return entry;
 }
 
-void *dlm_lowcomms_get_buffer(int nodeid, int len, int allocation, char **ppc)
+void *dlm_lowcomms_get_buffer(int nodeid, int len, gfp_t allocation, char **ppc)
 {
 	struct writequeue_entry *e;
 	int offset = 0;
--- a/fs/dlm/lowcomms.h
+++ b/fs/dlm/lowcomms.h
@@ -19,7 +19,7 @@ void dlm_lowcomms_exit(void);
 int dlm_lowcomms_start(void);
 void dlm_lowcomms_stop(void);
 int dlm_lowcomms_close(int nodeid);
-void *dlm_lowcomms_get_buffer(int nodeid, int len, int allocation, char **ppc);
+void *dlm_lowcomms_get_buffer(int nodeid, int len, gfp_t allocation, char **ppc);
 void dlm_lowcomms_commit_buffer(void *mh);
 
 #endif				/* __LOWCOMMS_DOT_H__ */

[Cluster-devel] [PATCH] DLM: use gfp_t

[Steven Whitehouse]

Hi,

This is now applied to the gfs2 -fixes git tree. Thanks,

Steve.

On Thu, 2006-10-05 at 19:02 +0400, Alexey Dobriyan wrote:
> Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
> ---
> 
>  fs/dlm/lowcomms.c |    6 +++---
>  fs/dlm/lowcomms.h |    2 +-
>  2 files changed, 4 insertions(+), 4 deletions(-)
> 
> --- a/fs/dlm/lowcomms.c
> +++ b/fs/dlm/lowcomms.c
> @@ -174,7 +174,7 @@ static int nodeid_to_addr(int nodeid, st
>  	return 0;
>  }
>  
> -static struct nodeinfo *nodeid2nodeinfo(int nodeid, int alloc)
> +static struct nodeinfo *nodeid2nodeinfo(int nodeid, gfp_t alloc)
>  {
>  	struct nodeinfo *ni;
>  	int r;
> @@ -726,7 +726,7 @@ static int init_sock(void)
>  }
>  
> 
> -static struct writequeue_entry *new_writequeue_entry(int allocation)
> +static struct writequeue_entry *new_writequeue_entry(gfp_t allocation)
>  {
>  	struct writequeue_entry *entry;
>  
> @@ -748,7 +748,7 @@ static struct writequeue_entry *new_writ
>  	return entry;
>  }
>  
> -void *dlm_lowcomms_get_buffer(int nodeid, int len, int allocation, char **ppc)
> +void *dlm_lowcomms_get_buffer(int nodeid, int len, gfp_t allocation, char **ppc)
>  {
>  	struct writequeue_entry *e;
>  	int offset = 0;
> --- a/fs/dlm/lowcomms.h
> +++ b/fs/dlm/lowcomms.h
> @@ -19,7 +19,7 @@ void dlm_lowcomms_exit(void);
>  int dlm_lowcomms_start(void);
>  void dlm_lowcomms_stop(void);
>  int dlm_lowcomms_close(int nodeid);
> -void *dlm_lowcomms_get_buffer(int nodeid, int len, int allocation, char **ppc);
> +void *dlm_lowcomms_get_buffer(int nodeid, int len, gfp_t allocation, char **ppc);
>  void dlm_lowcomms_commit_buffer(void *mh);
>  
>  #endif				/* __LOWCOMMS_DOT_H__ */
>