diff options
| author | Andi Kleen | 2010-07-21 00:24:27 +0200 |
|---|---|---|
| committer | J. Bruce Fields | 2010-07-30 01:32:17 +0200 |
| commit | 69049961014992f50b10d6c3cd3cd172d4aae5ac (patch) | |
| tree | d6717d7bc3eae733374cc9acb3a278a82498dced /fs/nfsd/nfs4state.c | |
| parent | nfsd4: share file descriptors between stateid's (diff) | |
| download | kernel-qcow2-linux-69049961014992f50b10d6c3cd3cd172d4aae5ac.tar.gz kernel-qcow2-linux-69049961014992f50b10d6c3cd3cd172d4aae5ac.tar.xz kernel-qcow2-linux-69049961014992f50b10d6c3cd3cd172d4aae5ac.zip | |
gcc-4.6: nfsd: fix initialized but not read warnings
Fixes at least one real minor bug: the nfs4 recovery dir sysctl
would not return its status properly.
Also I finished Al's 1e41568d7378d ("Take ima_path_check() in nfsd
past dentry_open() in nfsd_open()") commit, it moved the IMA
code, but left the old path initializer in there.
The rest is just dead code removed I think, although I was not
fully sure about the "is_borc" stuff. Some more review
would be still good.
Found by gcc 4.6's new warnings.
Signed-off-by: Andi Kleen <ak@linux.intel.com>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Neil Brown <neilb@suse.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'fs/nfsd/nfs4state.c')
| -rw-r--r-- | fs/nfsd/nfs4state.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index 7ab572f9f388..0b4351f8238a 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -3421,11 +3421,9 @@ static inline void nfs4_set_lock_denied(struct file_lock *fl, struct nfsd4_lock_denied *deny) { struct nfs4_stateowner *sop; - unsigned int hval; if (fl->fl_lmops == &nfsd_posix_mng_ops) { sop = (struct nfs4_stateowner *) fl->fl_owner; - hval = lockownerid_hashval(sop->so_id); kref_get(&sop->so_ref); deny->ld_sop = sop; deny->ld_clientid = sop->so_client->cl_clientid; |