aboutsummaryrefslogtreecommitdiffstats
path: root/fs/dlm/lowcomms.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/dlm/lowcomms.c')
-rw-r--r--fs/dlm/lowcomms.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/fs/dlm/lowcomms.c b/fs/dlm/lowcomms.c
index 70736eb4b516..c0d35c620526 100644
--- a/fs/dlm/lowcomms.c
+++ b/fs/dlm/lowcomms.c
@@ -51,6 +51,7 @@
51#include <linux/file.h> 51#include <linux/file.h>
52#include <linux/mutex.h> 52#include <linux/mutex.h>
53#include <linux/sctp.h> 53#include <linux/sctp.h>
54#include <linux/slab.h>
54#include <net/sctp/user.h> 55#include <net/sctp/user.h>
55#include <net/ipv6.h> 56#include <net/ipv6.h>
56 57
@@ -1060,7 +1061,7 @@ static void init_local(void)
1060 if (dlm_our_addr(&sas, i)) 1061 if (dlm_our_addr(&sas, i))
1061 break; 1062 break;
1062 1063
1063 addr = kmalloc(sizeof(*addr), GFP_KERNEL); 1064 addr = kmalloc(sizeof(*addr), GFP_NOFS);
1064 if (!addr) 1065 if (!addr)
1065 break; 1066 break;
1066 memcpy(addr, &sas, sizeof(*addr)); 1067 memcpy(addr, &sas, sizeof(*addr));
@@ -1099,7 +1100,7 @@ static int sctp_listen_for_all(void)
1099 struct sockaddr_storage localaddr; 1100 struct sockaddr_storage localaddr;
1100 struct sctp_event_subscribe subscribe; 1101 struct sctp_event_subscribe subscribe;
1101 int result = -EINVAL, num = 1, i, addr_len; 1102 int result = -EINVAL, num = 1, i, addr_len;
1102 struct connection *con = nodeid2con(0, GFP_KERNEL); 1103 struct connection *con = nodeid2con(0, GFP_NOFS);
1103 int bufsize = NEEDED_RMEM; 1104 int bufsize = NEEDED_RMEM;
1104 1105
1105 if (!con) 1106 if (!con)
@@ -1171,7 +1172,7 @@ out:
1171static int tcp_listen_for_all(void) 1172static int tcp_listen_for_all(void)
1172{ 1173{
1173 struct socket *sock = NULL; 1174 struct socket *sock = NULL;
1174 struct connection *con = nodeid2con(0, GFP_KERNEL); 1175 struct connection *con = nodeid2con(0, GFP_NOFS);
1175 int result = -EINVAL; 1176 int result = -EINVAL;
1176 1177
1177 if (!con) 1178 if (!con)