diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2009-06-17 13:23:01 -0700 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2009-06-17 13:23:01 -0700 |
| commit | 5cd973c44a92f4abf8f7084c804089b3eaa7b4bf (patch) | |
| tree | 7bea559ab6c0a2ab4885a6064147b0cae20b8293 /fs/lockd | |
| parent | 3f09df70e3a33590ae5a97b8a15486d3711c7065 (diff) | |
| download | linux-5cd973c44a92f4abf8f7084c804089b3eaa7b4bf.tar.gz linux-5cd973c44a92f4abf8f7084c804089b3eaa7b4bf.tar.bz2 linux-5cd973c44a92f4abf8f7084c804089b3eaa7b4bf.zip | |
NFSv4/NLM: Push file locking BKL dependencies down into the NLM layer
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/lockd')
| -rw-r--r-- | fs/lockd/clntproc.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/lockd/clntproc.c b/fs/lockd/clntproc.c index dd7957064a8c..273e229353f3 100644 --- a/fs/lockd/clntproc.c +++ b/fs/lockd/clntproc.c @@ -165,6 +165,7 @@ int nlmclnt_proc(struct nlm_host *host, int cmd, struct file_lock *fl) /* Set up the argument struct */ nlmclnt_setlockargs(call, fl); + lock_kernel(); if (IS_SETLK(cmd) || IS_SETLKW(cmd)) { if (fl->fl_type != F_UNLCK) { call->a_args.block = IS_SETLKW(cmd) ? 1 : 0; @@ -178,6 +179,7 @@ int nlmclnt_proc(struct nlm_host *host, int cmd, struct file_lock *fl) fl->fl_ops->fl_release_private(fl); fl->fl_ops = NULL; + unlock_kernel(); dprintk("lockd: clnt proc returns %d\n", status); return status; |