Author: kib
Date: Sun Jun 26 13:16:02 2016
New Revision: 302208
URL: https://svnweb.freebsd.org/changeset/base/302208

Log:
  MFC r302019:
  Do not access NFS data for reclaimed vnode.

Modified:
  stable/10/sys/fs/nfsclient/nfs_clvnops.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/fs/nfsclient/nfs_clvnops.c
==============================================================================
--- stable/10/sys/fs/nfsclient/nfs_clvnops.c    Sun Jun 26 12:41:02 2016        
(r302207)
+++ stable/10/sys/fs/nfsclient/nfs_clvnops.c    Sun Jun 26 13:16:02 2016        
(r302208)
@@ -3098,10 +3098,14 @@ nfs_advlock(struct vop_advlock_args *ap)
                        }
                }
                if (error == 0 && ap->a_op == F_SETLK) {
-                       /* Mark that a file lock has been acquired. */
-                       mtx_lock(&np->n_mtx);
-                       np->n_flag |= NHASBEENLOCKED;
-                       mtx_unlock(&np->n_mtx);
+                       error = NFSVOPLOCK(vp, LK_SHARED);
+                       if (error == 0) {
+                               /* Mark that a file lock has been acquired. */
+                               mtx_lock(&np->n_mtx);
+                               np->n_flag |= NHASBEENLOCKED;
+                               mtx_unlock(&np->n_mtx);
+                               NFSVOPUNLOCK(vp, 0);
+                       }
                }
        }
        return (error);
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to