Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'nfs-for-7.0-2' of git://git.linux-nfs.org/projects/anna/linux-nfs
Pull NFS client fixes from Anna Schumaker:
- Fix NFS KConfig typos
- Decrement re_receiving on the early exit paths
- return EISDIR on nfs3_proc_create if d_alias is a dir
* tag 'nfs-for-7.0-2' of git://git.linux-nfs.org/projects/anna/linux-nfs:
NFS: Fix NFS KConfig typos
xprtrdma: Decrement re_receiving on the early exit paths
nfs: return EISDIR on nfs3_proc_create if d_alias is a dir
+12
-5
+2
-1
fs/nfs/Kconfig
+2
-1
fs/nfs/Kconfig
···
87
87
space programs which can be found in the Linux nfs-utils package,
88
88
available from http://linux-nfs.org/.
89
89
90
-
If unsure, say Y.
90
+
If unsure, say N.
91
91
92
92
config NFS_SWAP
93
93
bool "Provide swap over NFS support"
···
100
100
config NFS_V4_0
101
101
bool "NFS client support for NFSv4.0"
102
102
depends on NFS_V4
103
+
default y
103
104
help
104
105
This option enables support for minor version 0 of the NFSv4 protocol
105
106
(RFC 3530) in the kernel's NFS client.
+6
-1
fs/nfs/nfs3proc.c
+6
-1
fs/nfs/nfs3proc.c
···
392
392
if (status != 0)
393
393
goto out_release_acls;
394
394
395
-
if (d_alias)
395
+
if (d_alias) {
396
+
if (d_is_dir(d_alias)) {
397
+
status = -EISDIR;
398
+
goto out_dput;
399
+
}
396
400
dentry = d_alias;
401
+
}
397
402
398
403
/* When we created the file with exclusive semantics, make
399
404
* sure we set the attributes afterwards. */
+4
-3
net/sunrpc/xprtrdma/verbs.c
+4
-3
net/sunrpc/xprtrdma/verbs.c
···
1362
1362
needed += RPCRDMA_MAX_RECV_BATCH;
1363
1363
1364
1364
if (atomic_inc_return(&ep->re_receiving) > 1)
1365
-
goto out;
1365
+
goto out_dec;
1366
1366
1367
1367
/* fast path: all needed reps can be found on the free list */
1368
1368
wr = NULL;
···
1385
1385
++count;
1386
1386
}
1387
1387
if (!wr)
1388
-
goto out;
1388
+
goto out_dec;
1389
1389
1390
1390
rc = ib_post_recv(ep->re_id->qp, wr,
1391
1391
(const struct ib_recv_wr **)&bad_wr);
···
1400
1400
--count;
1401
1401
}
1402
1402
}
1403
+
1404
+
out_dec:
1403
1405
if (atomic_dec_return(&ep->re_receiving) > 0)
1404
1406
complete(&ep->re_done);
1405
-
1406
1407
out:
1407
1408
trace_xprtrdma_post_recvs(r_xprt, count);
1408
1409
ep->re_receive_count += count;