Date: Mon, 6 Aug 2012 15:22:12 +0000 (UTC) From: Jakub Wojciech Klama <jceel@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r239094 - user/jceel/soc2012_armv6/sys/nfsclient Message-ID: <201208061522.q76FMC7n052368@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jceel Date: Mon Aug 6 15:22:11 2012 New Revision: 239094 URL: http://svn.freebsd.org/changeset/base/239094 Log: Fix mutex recursion in NFS client by removing MNT_ILOCK and MNT_INUNLOCK in nfs_sync(). Modified: user/jceel/soc2012_armv6/sys/nfsclient/nfs_vfsops.c Modified: user/jceel/soc2012_armv6/sys/nfsclient/nfs_vfsops.c ============================================================================== --- user/jceel/soc2012_armv6/sys/nfsclient/nfs_vfsops.c Mon Aug 6 11:02:23 2012 (r239093) +++ user/jceel/soc2012_armv6/sys/nfsclient/nfs_vfsops.c Mon Aug 6 15:22:11 2012 (r239094) @@ -1442,14 +1442,18 @@ nfs_sync(struct mount *mp, int waitfor) td = curthread; +#if 0 MNT_ILOCK(mp); +#endif /* * If a forced dismount is in progress, return from here so that * the umount(2) syscall doesn't get stuck in VFS_SYNC() before * calling VFS_UNMOUNT(). */ if ((mp->mnt_kern_flag & MNTK_UNMOUNTF) != 0) { +#if 0 MNT_IUNLOCK(mp); +#endif return (EBADF); }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201208061522.q76FMC7n052368>