diff options
| -rw-r--r-- | fs/dlm/lowcomms.c | 6 | ||||
| -rw-r--r-- | fs/dlm/lowcomms.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/fs/dlm/lowcomms.c b/fs/dlm/lowcomms.c index 23f5ce12080b..7bcea7c5addb 100644 --- a/fs/dlm/lowcomms.c +++ b/fs/dlm/lowcomms.c | |||
| @@ -174,7 +174,7 @@ static int nodeid_to_addr(int nodeid, struct sockaddr *retaddr) | |||
| 174 | return 0; | 174 | return 0; |
| 175 | } | 175 | } |
| 176 | 176 | ||
| 177 | static struct nodeinfo *nodeid2nodeinfo(int nodeid, int alloc) | 177 | static struct nodeinfo *nodeid2nodeinfo(int nodeid, gfp_t alloc) |
| 178 | { | 178 | { |
| 179 | struct nodeinfo *ni; | 179 | struct nodeinfo *ni; |
| 180 | int r; | 180 | int r; |
| @@ -726,7 +726,7 @@ static int init_sock(void) | |||
| 726 | } | 726 | } |
| 727 | 727 | ||
| 728 | 728 | ||
| 729 | static struct writequeue_entry *new_writequeue_entry(int allocation) | 729 | static struct writequeue_entry *new_writequeue_entry(gfp_t allocation) |
| 730 | { | 730 | { |
| 731 | struct writequeue_entry *entry; | 731 | struct writequeue_entry *entry; |
| 732 | 732 | ||
| @@ -748,7 +748,7 @@ static struct writequeue_entry *new_writequeue_entry(int allocation) | |||
| 748 | return entry; | 748 | return entry; |
| 749 | } | 749 | } |
| 750 | 750 | ||
| 751 | void *dlm_lowcomms_get_buffer(int nodeid, int len, int allocation, char **ppc) | 751 | void *dlm_lowcomms_get_buffer(int nodeid, int len, gfp_t allocation, char **ppc) |
| 752 | { | 752 | { |
| 753 | struct writequeue_entry *e; | 753 | struct writequeue_entry *e; |
| 754 | int offset = 0; | 754 | int offset = 0; |
diff --git a/fs/dlm/lowcomms.h b/fs/dlm/lowcomms.h index 6c04bb09cfa8..2d045e0daae1 100644 --- a/fs/dlm/lowcomms.h +++ b/fs/dlm/lowcomms.h | |||
| @@ -19,7 +19,7 @@ void dlm_lowcomms_exit(void); | |||
| 19 | int dlm_lowcomms_start(void); | 19 | int dlm_lowcomms_start(void); |
| 20 | void dlm_lowcomms_stop(void); | 20 | void dlm_lowcomms_stop(void); |
| 21 | int dlm_lowcomms_close(int nodeid); | 21 | int dlm_lowcomms_close(int nodeid); |
| 22 | void *dlm_lowcomms_get_buffer(int nodeid, int len, int allocation, char **ppc); | 22 | void *dlm_lowcomms_get_buffer(int nodeid, int len, gfp_t allocation, char **ppc); |
| 23 | void dlm_lowcomms_commit_buffer(void *mh); | 23 | void dlm_lowcomms_commit_buffer(void *mh); |
| 24 | 24 | ||
| 25 | #endif /* __LOWCOMMS_DOT_H__ */ | 25 | #endif /* __LOWCOMMS_DOT_H__ */ |
