Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 39738
b: refs/heads/master
c: 4481d10
h: refs/heads/master
v: v3
  • Loading branch information
NeilBrown authored and Linus Torvalds committed Oct 17, 2006
1 parent 5241806 commit f0ab485
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 0942176f4353ffebcd6e3f95abce9fd8e24f2cb1
refs/heads/master: 4481d1038f4116f3f5c307d919e6dc815a3acbb9
11 changes: 10 additions & 1 deletion trunk/fs/lockd/svcsubs.c
Original file line number Diff line number Diff line change
Expand Up @@ -324,7 +324,16 @@ nlmsvc_same_host(struct nlm_host *host, struct nlm_host *other)
static int
nlmsvc_is_client(struct nlm_host *host, struct nlm_host *dummy)
{
return host->h_server;
if (host->h_server) {
/* we are destroying locks even though the client
* hasn't asked us too, so don't unmonitor the
* client
*/
if (host->h_nsmhandle)
host->h_nsmhandle->sm_sticky = 1;
return 1;
} else
return 0;
}

/*
Expand Down

0 comments on commit f0ab485

Please sign in to comment.