Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'for-2.6.29' of git://linux-nfs.org/~bfields/linux
* 'for-2.6.29' of git://linux-nfs.org/~bfields/linux:
nfsd: only set file_lock.fl_lmops in nfsd4_lockt if a stateowner is found
nfsd: fix cred leak on every rpc
nfsd: fix null dereference on error path
nfs: note that CONFIG_SUNRPC_XPRT_RDMA turns on server side support too
update port number in NFS/RDMA documentation
+7
-6
+2
-2
Documentation/filesystems/nfs-rdma.txt
+2
-2
Documentation/filesystems/nfs-rdma.txt
···
251
251
252
252
Instruct the server to listen on the RDMA transport:
253
253
254
-
$ echo rdma 2050 > /proc/fs/nfsd/portlist
254
+
$ echo rdma 20049 > /proc/fs/nfsd/portlist
255
255
256
256
- On the client system
257
257
···
263
263
Regardless of how the client was built (module or built-in), use this
264
264
command to mount the NFS/RDMA server:
265
265
266
-
$ mount -o rdma,port=2050 <IPoIB-server-name-or-address>:/<export> /mnt
266
+
$ mount -o rdma,port=20049 <IPoIB-server-name-or-address>:/<export> /mnt
267
267
268
268
To verify that the mount is using RDMA, run "cat /proc/mounts" and check
269
269
the "proto" field for the given mount.
+3
fs/nfsd/auth.c
+3
fs/nfsd/auth.c
···
49
49
new->fsuid = exp->ex_anon_uid;
50
50
new->fsgid = exp->ex_anon_gid;
51
51
gi = groups_alloc(0);
52
+
if (!gi)
53
+
goto oom;
52
54
} else if (flags & NFSEXP_ROOTSQUASH) {
53
55
if (!new->fsuid)
54
56
new->fsuid = exp->ex_anon_uid;
···
87
85
new->cap_effective = cap_raise_nfsd_set(new->cap_effective,
88
86
new->cap_permitted);
89
87
put_cred(override_creds(new));
88
+
put_cred(new);
90
89
return 0;
91
90
92
91
oom:
-1
fs/nfsd/nfs4state.c
-1
fs/nfsd/nfs4state.c
···
2871
2871
file_lock.fl_owner = (fl_owner_t)lockt->lt_stateowner;
2872
2872
file_lock.fl_pid = current->tgid;
2873
2873
file_lock.fl_flags = FL_POSIX;
2874
-
file_lock.fl_lmops = &nfsd_posix_mng_ops;
2875
2874
2876
2875
file_lock.fl_start = lockt->lt_offset;
2877
2876
file_lock.fl_end = last_byte_offset(lockt->lt_offset, lockt->lt_length);
+2
-3
net/sunrpc/Kconfig
+2
-3
net/sunrpc/Kconfig
···
9
9
depends on SUNRPC && INFINIBAND && EXPERIMENTAL
10
10
default SUNRPC && INFINIBAND
11
11
help
12
-
This option enables an RPC client transport capability that
13
-
allows the NFS client to mount servers via an RDMA-enabled
14
-
transport.
12
+
This option allows the NFS client and server to support
13
+
an RDMA-enabled transport.
15
14
16
15
To compile RPC client RDMA transport support as a module,
17
16
choose M here: the module will be called xprtrdma.