diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2008-08-24 07:29:52 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2008-10-23 05:13:10 -0400 |
commit | 53c9c5c0e32c69f9df1822e47671c13e3402c82f (patch) | |
tree | 76aae2cfde109c97451d40b5c6e5063e22690a03 /arch/alpha/kernel | |
parent | a9885444f7ff6e9156adb1adf5558ded9a39ad0a (diff) |
[PATCH] prepare vfs_readdir() callers to returning filldir result
It's not the final state, but it allows moving ->readdir() instances
to passing filldir return value to caller of vfs_readdir().
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'arch/alpha/kernel')
-rw-r--r-- | arch/alpha/kernel/osf_sys.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/arch/alpha/kernel/osf_sys.c b/arch/alpha/kernel/osf_sys.c index 8509dad31204..f25f6c490952 100644 --- a/arch/alpha/kernel/osf_sys.c +++ b/arch/alpha/kernel/osf_sys.c | |||
@@ -165,14 +165,11 @@ osf_getdirentries(unsigned int fd, struct osf_dirent __user *dirent, | |||
165 | buf.error = 0; | 165 | buf.error = 0; |
166 | 166 | ||
167 | error = vfs_readdir(file, osf_filldir, &buf); | 167 | error = vfs_readdir(file, osf_filldir, &buf); |
168 | if (error < 0) | 168 | if (error >= 0) |
169 | goto out_putf; | 169 | error = buf.error; |
170 | |||
171 | error = buf.error; | ||
172 | if (count != buf.count) | 170 | if (count != buf.count) |
173 | error = count - buf.count; | 171 | error = count - buf.count; |
174 | 172 | ||
175 | out_putf: | ||
176 | fput(file); | 173 | fput(file); |
177 | out: | 174 | out: |
178 | return error; | 175 | return error; |