diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-11-19 09:02:14 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-11-19 09:02:14 +0100 |
| commit | 80da549e5225c6f80d45f76ba2b3a4574ed278ae (patch) | |
| tree | 59799c3d7b7d4a088abdfa3052c3682ed826ba7e /fs/lockd/svcproc.c | |
| parent | ASoC: wm2200: Convert over to wm_adsp for ADSP1 support (diff) | |
| parent | Linux 3.7-rc6 (diff) | |
| download | linux-80da549e5225c6f80d45f76ba2b3a4574ed278ae.tar.xz linux-80da549e5225c6f80d45f76ba2b3a4574ed278ae.zip | |
Merge tag 'v3.7-rc6' into asoc-wm2200
Linux 3.7-rc6
Diffstat (limited to 'fs/lockd/svcproc.c')
| -rw-r--r-- | fs/lockd/svcproc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/lockd/svcproc.c b/fs/lockd/svcproc.c index 3009a365e082..21171f0c6477 100644 --- a/fs/lockd/svcproc.c +++ b/fs/lockd/svcproc.c @@ -68,7 +68,8 @@ nlmsvc_retrieve_args(struct svc_rqst *rqstp, struct nlm_args *argp, /* Obtain file pointer. Not used by FREE_ALL call. */ if (filp != NULL) { - if ((error = nlm_lookup_file(rqstp, &file, &lock->fh)) != 0) + error = cast_status(nlm_lookup_file(rqstp, &file, &lock->fh)); + if (error != 0) goto no_locks; *filp = file; |