Commit 501c1ed3 authored Dec 04, 2008 by Chuck Lever Committed by J. Bruce Fields Jan 06, 2009

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>

parent 9fee4902

fs/lockd/clntproc.c

+2 −4

Original line number	Diff line number	Diff line
		@@ -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;