diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-20 22:25:39 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-20 22:25:39 (GMT) |
| commit | b5898cd057001336888b6aff601385b5f5e79b01 (patch) | |
| tree | 80f456b6b879c84800f7006e98b29e9c6bdd3831 /fs/coredump.c | |
| parent | 2a46eed54a28c1e3de701ca4237ce4f8bebf14c6 (diff) | |
| parent | 31dec1327e377b6d91a8a6c92b5cd8513939a233 (diff) | |
| download | linux-fsl-qoriq-b5898cd057001336888b6aff601385b5f5e79b01.tar.xz | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull vfs bits and pieces from Al Viro:
"Assorted bits that got missed in the first pull request + fixes for a
couple of coredump regressions"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
fold try_to_ascend() into the sole remaining caller
dcache.c: get rid of pointless macros
take read_seqbegin_or_lock() and friends to seqlock.h
consolidate simple ->d_delete() instances
gfs2: endianness misannotations
dump_emit(): use __kernel_write(), not vfs_write()
dump_align(): fix the dumb braino
Diffstat (limited to 'fs/coredump.c')
| -rw-r--r-- | fs/coredump.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/coredump.c b/fs/coredump.c index 62406b6..bc3fbcd 100644 --- a/fs/coredump.c +++ b/fs/coredump.c @@ -695,7 +695,7 @@ int dump_emit(struct coredump_params *cprm, const void *addr, int nr) while (nr) { if (dump_interrupted()) return 0; - n = vfs_write(file, addr, nr, &pos); + n = __kernel_write(file, addr, nr, &pos); if (n <= 0) return 0; file->f_pos = pos; @@ -733,7 +733,7 @@ int dump_align(struct coredump_params *cprm, int align) { unsigned mod = cprm->written & (align - 1); if (align & (align - 1)) - return -EINVAL; - return mod ? dump_skip(cprm, align - mod) : 0; + return 0; + return mod ? dump_skip(cprm, align - mod) : 1; } EXPORT_SYMBOL(dump_align); |