OSDN Git Service
(root)
/
uclinux-h8
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a2d30a5
)
lockd: Remove BUG_ON()s from fs/lockd/clntproc.c
author
Trond Myklebust
<Trond.Myklebust@netapp.com>
Mon, 15 Oct 2012 21:28:45 +0000
(17:28 -0400)
committer
Trond Myklebust
<Trond.Myklebust@netapp.com>
Sun, 4 Nov 2012 19:43:40 +0000
(14:43 -0500)
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
fs/lockd/clntproc.c
patch
|
blob
|
history
diff --git
a/fs/lockd/clntproc.c
b/fs/lockd/clntproc.c
index
05d2912
..
54f9e6c
100644
(file)
--- 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);