diff options
| author | Chuck Lever <chuck.lever@oracle.com> | 2008-12-04 14:21:01 -0500 |
|---|---|---|
| committer | J. Bruce Fields <bfields@citi.umich.edu> | 2009-01-06 11:53:51 -0500 |
| commit | 501c1ed3fb5c2648ba1709282c71617910917f66 (patch) | |
| tree | 600bb4b00d4d222fceea5a8187f513e8eb979e61 /fs/lockd | |
| parent | 9fee49024ed19d849413df4ab6ec1a1a60aaae94 (diff) | |
| download | lwn-501c1ed3fb5c2648ba1709282c71617910917f66.tar.gz lwn-501c1ed3fb5c2648ba1709282c71617910917f66.zip | |
NLM: Remove redundant printk() in nlmclnt_lock()
The nsm_monitor() function already generates a printk(KERN_NOTICE) if
the SM_MON upcall fails, so the similar printk() in the nlmclnt_lock()
function is redundant.
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
Diffstat (limited to 'fs/lockd')
| -rw-r--r-- | fs/lockd/clntproc.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/fs/lockd/clntproc.c b/fs/lockd/clntproc.c index 31668b690e03..5ce42e0ed4a0 100644 --- a/fs/lockd/clntproc.c +++ b/fs/lockd/clntproc.c @@ -518,11 +518,9 @@ nlmclnt_lock(struct nlm_rqst *req, struct file_lock *fl) unsigned char fl_type; int status = -ENOLCK; - if (nsm_monitor(host) < 0) { - printk(KERN_NOTICE "lockd: failed to monitor %s\n", - host->h_name); + if (nsm_monitor(host) < 0) goto out; - } + fl->fl_flags |= FL_ACCESS; status = do_vfs_lock(fl); fl->fl_flags = fl_flags; |