lockd: Remove BUG_ON()s from fs/lockd/clntproc.c

Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
This commit is contained in:
Trond Myklebust 2012-10-15 17:28:45 -04:00
parent a2d30a54df
commit 262693482c

View File

@ -141,7 +141,7 @@ static void nlmclnt_setlockargs(struct nlm_rqst *req, struct file_lock *fl)
static void nlmclnt_release_lockargs(struct nlm_rqst *req) static void nlmclnt_release_lockargs(struct nlm_rqst *req)
{ {
BUG_ON(req->a_args.lock.fl.fl_ops != NULL); WARN_ON_ONCE(req->a_args.lock.fl.fl_ops != NULL);
} }
/** /**
@ -465,7 +465,6 @@ static const struct file_lock_operations nlmclnt_lock_ops = {
static void nlmclnt_locks_init_private(struct file_lock *fl, struct nlm_host *host) static void nlmclnt_locks_init_private(struct file_lock *fl, struct nlm_host *host)
{ {
BUG_ON(fl->fl_ops != NULL);
fl->fl_u.nfs_fl.state = 0; fl->fl_u.nfs_fl.state = 0;
fl->fl_u.nfs_fl.owner = nlm_find_lockowner(host, fl->fl_owner); fl->fl_u.nfs_fl.owner = nlm_find_lockowner(host, fl->fl_owner);
INIT_LIST_HEAD(&fl->fl_u.nfs_fl.list); INIT_LIST_HEAD(&fl->fl_u.nfs_fl.list);