diff --git a/[refs] b/[refs] index ca28534dabc6..714fb1066033 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 501c1ed3fb5c2648ba1709282c71617910917f66 +refs/heads/master: 5bc74bef7c9b652f0f2aa9c5a8d5ac86881aba79 diff --git a/trunk/fs/lockd/mon.c b/trunk/fs/lockd/mon.c index 697bdcdd20cc..bb5fc1bb37f7 100644 --- a/trunk/fs/lockd/mon.c +++ b/trunk/fs/lockd/mon.c @@ -80,7 +80,6 @@ nsm_monitor(struct nlm_host *host) int status; dprintk("lockd: nsm_monitor(%s)\n", nsm->sm_name); - BUG_ON(nsm == NULL); if (nsm->sm_monitored) return 0;