From mboxrd@z Thu Jan 1 00:00:00 1970 From: "J. Bruce Fields" Subject: nfsd bug fixes for 3.15 Date: Thu, 24 Apr 2014 02:25:16 -0400 Message-ID: <20140424062516.GA8891@fieldses.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: linux-nfs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-fsdevel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, jlayton-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org To: Linus Torvalds Return-path: Content-Disposition: inline Sender: linux-nfs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org List-Id: linux-fsdevel.vger.kernel.org Please pull the following bug fixes for 3.15 from: git://linux-nfs.org/~bfields/linux.git for-3.15 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. --b. ---------------------------------------------------------------- J. Bruce Fields (1): Revert "nfsd4: fix nfs4err_resource in 4.1 case" Jeff Layton (2): locks: allow __break_lease to sleep even when break_time is 0 nfsd: set timeparms.to_maxval in setup_callback_client fs/locks.c | 7 +++---- fs/nfsd/nfs4callback.c | 4 +++- fs/nfsd/nfs4xdr.c | 8 -------- 3 files changed, 6 insertions(+), 13 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html