diff options
Diffstat (limited to 'fs/lockd/clntproc.c')
| -rw-r--r-- | fs/lockd/clntproc.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/fs/lockd/clntproc.c b/fs/lockd/clntproc.c index 31668b690e03..dd7957064a8c 100644 --- a/fs/lockd/clntproc.c +++ b/fs/lockd/clntproc.c | |||
| @@ -16,7 +16,6 @@ | |||
| 16 | #include <linux/sunrpc/clnt.h> | 16 | #include <linux/sunrpc/clnt.h> |
| 17 | #include <linux/sunrpc/svc.h> | 17 | #include <linux/sunrpc/svc.h> |
| 18 | #include <linux/lockd/lockd.h> | 18 | #include <linux/lockd/lockd.h> |
| 19 | #include <linux/lockd/sm_inter.h> | ||
| 20 | 19 | ||
| 21 | #define NLMDBG_FACILITY NLMDBG_CLIENT | 20 | #define NLMDBG_FACILITY NLMDBG_CLIENT |
| 22 | #define NLMCLNT_GRACE_WAIT (5*HZ) | 21 | #define NLMCLNT_GRACE_WAIT (5*HZ) |
| @@ -518,11 +517,9 @@ nlmclnt_lock(struct nlm_rqst *req, struct file_lock *fl) | |||
| 518 | unsigned char fl_type; | 517 | unsigned char fl_type; |
| 519 | int status = -ENOLCK; | 518 | int status = -ENOLCK; |
| 520 | 519 | ||
| 521 | if (nsm_monitor(host) < 0) { | 520 | if (nsm_monitor(host) < 0) |
| 522 | printk(KERN_NOTICE "lockd: failed to monitor %s\n", | ||
| 523 | host->h_name); | ||
| 524 | goto out; | 521 | goto out; |
| 525 | } | 522 | |
| 526 | fl->fl_flags |= FL_ACCESS; | 523 | fl->fl_flags |= FL_ACCESS; |
| 527 | status = do_vfs_lock(fl); | 524 | status = do_vfs_lock(fl); |
| 528 | fl->fl_flags = fl_flags; | 525 | fl->fl_flags = fl_flags; |