diff --git a/[refs] b/[refs] index 305215c9647e..d417a53b4cb1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d5f50b0c290431c65377c4afa1c764e2c3fe5305 +refs/heads/master: 79f77bf9a4e3dd5ead006b8f17e7c4ff07d8374e diff --git a/trunk/fs/nfsd/vfs.c b/trunk/fs/nfsd/vfs.c index 0ef9b6b410a2..b31e46eeb026 100644 --- a/trunk/fs/nfsd/vfs.c +++ b/trunk/fs/nfsd/vfs.c @@ -936,6 +936,7 @@ nfsd_vfs_read(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file, .u.data = rqstp, }; + WARN_ON_ONCE(rqstp->rq_resused != 1); rqstp->rq_resused = 1; host_err = splice_direct_to_actor(file, &sd, nfsd_direct_splice_actor); } else {