Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'for-3.15' of git://linux-nfs.org/~bfields/linux
Pull nfsd bugfixes from Bruce Fields:
"Three small nfsd bugfixes (including one locks.c fix for a bug
triggered only from nfsd).
Jeff's patches are for long-existing problems that became easier to
trigger since the addition of vfs delegation support"
* 'for-3.15' of git://linux-nfs.org/~bfields/linux:
Revert "nfsd4: fix nfs4err_resource in 4.1 case"
nfsd: set timeparms.to_maxval in setup_callback_client
locks: allow __break_lease to sleep even when break_time is 0
+6
-13
+3
-4
fs/locks.c
+3
-4
fs/locks.c
···
1391
1391
1392
1392
restart:
1393
1393
break_time = flock->fl_break_time;
1394
-
if (break_time != 0) {
1394
+
if (break_time != 0)
1395
1395
break_time -= jiffies;
1396
-
if (break_time == 0)
1397
-
break_time++;
1398
-
}
1396
+
if (break_time == 0)
1397
+
break_time++;
1399
1398
locks_insert_block(flock, new_fl);
1400
1399
spin_unlock(&inode->i_lock);
1401
1400
error = wait_event_interruptible_timeout(new_fl->fl_wait,
+3
-1
fs/nfsd/nfs4callback.c
+3
-1
fs/nfsd/nfs4callback.c
···
654
654
655
655
static int setup_callback_client(struct nfs4_client *clp, struct nfs4_cb_conn *conn, struct nfsd4_session *ses)
656
656
{
657
+
int maxtime = max_cb_time(clp->net);
657
658
struct rpc_timeout timeparms = {
658
-
.to_initval = max_cb_time(clp->net),
659
+
.to_initval = maxtime,
659
660
.to_retries = 0,
661
+
.to_maxval = maxtime,
660
662
};
661
663
struct rpc_create_args args = {
662
664
.net = clp->net,
-8
fs/nfsd/nfs4xdr.c
-8
fs/nfsd/nfs4xdr.c
···
3627
3627
/* nfsd4_check_resp_size guarantees enough room for error status */
3628
3628
if (!op->status)
3629
3629
op->status = nfsd4_check_resp_size(resp, 0);
3630
-
if (op->status == nfserr_resource && nfsd4_has_session(&resp->cstate)) {
3631
-
struct nfsd4_slot *slot = resp->cstate.slot;
3632
-
3633
-
if (slot->sl_flags & NFSD4_SLOT_CACHETHIS)
3634
-
op->status = nfserr_rep_too_big_to_cache;
3635
-
else
3636
-
op->status = nfserr_rep_too_big;
3637
-
}
3638
3630
if (so) {
3639
3631
so->so_replay.rp_status = op->status;
3640
3632
so->so_replay.rp_buflen = (char *)resp->p - (char *)(statp+1);