Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 38d6fd26 authored by Al Viro's avatar Al Viro Committed by Linus Torvalds
Browse files

[PATCH] dlm gfp_t annotations 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 5c09d96b

fs/dlm/lowcomms.c

+3 −3
Original line number Diff line number Diff line
@@ -174,7 +174,7 @@ static int nodeid_to_addr(int nodeid, struct sockaddr *retaddr) 
	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_writequeue_entry(int allocation) 
	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;

fs/dlm/lowcomms.h

+1 −1
Original line number Diff line number Diff line
@@ -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__ */