diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2012-10-15 17:28:45 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2012-11-04 14:43:40 -0500 |
| commit | 262693482cd56f887174ad1c0c2bb4f94ffad0ee (patch) | |
| tree | 9b2a115e7c99613e4dc3f0732ccff77224f279b8 | |
| parent | a2d30a54df968c01fff4a412ac23f55832f45fe6 (diff) | |
| download | lwn-262693482cd56f887174ad1c0c2bb4f94ffad0ee.tar.gz lwn-262693482cd56f887174ad1c0c2bb4f94ffad0ee.zip | |
lockd: Remove BUG_ON()s from fs/lockd/clntproc.c
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
| -rw-r--r-- | fs/lockd/clntproc.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/lockd/clntproc.c b/fs/lockd/clntproc.c index 05d29124c6ab..54f9e6ce0430 100644 --- a/fs/lockd/clntproc.c +++ b/fs/lockd/clntproc.c @@ -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); |