diff options
| author | Andi Kleen <andi@firstfloor.org> | 2010-07-20 15:24:27 -0700 |
|---|---|---|
| committer | J. Bruce Fields <bfields@redhat.com> | 2010-07-29 19:32:17 -0400 |
| commit | 69049961014992f50b10d6c3cd3cd172d4aae5ac (patch) | |
| tree | d6717d7bc3eae733374cc9acb3a278a82498dced /fs/nfsd/nfsctl.c | |
| parent | f9d7562fdb9dc0ada3a7aba5dbbe9d965e2a105d (diff) | |
| download | op-kernel-dev-69049961014992f50b10d6c3cd3cd172d4aae5ac.zip op-kernel-dev-69049961014992f50b10d6c3cd3cd172d4aae5ac.tar.gz | |
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/nfsctl.c')
| -rw-r--r-- | fs/nfsd/nfsctl.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/nfsd/nfsctl.c b/fs/nfsd/nfsctl.c index b1c5be8..12f0ee7 100644 --- a/fs/nfsd/nfsctl.c +++ b/fs/nfsd/nfsctl.c @@ -1306,6 +1306,8 @@ static ssize_t __write_recoverydir(struct file *file, char *buf, size_t size) return -EINVAL; status = nfs4_reset_recoverydir(recdir); + if (status) + return status; } return scnprintf(buf, SIMPLE_TRANSACTION_LIMIT, "%s\n", |
