]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
lockd: Remove BUG_ON()s from fs/lockd/clntproc.c
authorTrond Myklebust <Trond.Myklebust@netapp.com>
Mon, 15 Oct 2012 21:28:45 +0000 (17:28 -0400)
committerTrond Myklebust <Trond.Myklebust@netapp.com>
Wed, 31 Oct 2012 20:27:30 +0000 (16:27 -0400)
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
fs/lockd/clntproc.c

index 05d29124c6ab4150c9a5381cbc98b9a472c65b25..54f9e6ce0430ae88d742709bc47499c0d1b71731 100644 (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)
 {
-       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)
 {
-       BUG_ON(fl->fl_ops != NULL);
        fl->fl_u.nfs_fl.state = 0;
        fl->fl_u.nfs_fl.owner = nlm_find_lockowner(host, fl->fl_owner);
        INIT_LIST_HEAD(&fl->fl_u.nfs_fl.list);