projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branches 'asoc/topic/fsl-spdif', 'asoc/topic/hdmi', 'asoc/topic...
[cascardo/linux.git]
/
fs
/
coredump.c
diff --git
a/fs/coredump.c
b/fs/coredump.c
index
38a7ab8
..
281b768
100644
(file)
--- a/
fs/coredump.c
+++ b/
fs/coredump.c
@@
-794,6
+794,7
@@
int dump_emit(struct coredump_params *cprm, const void *addr, int nr)
return 0;
file->f_pos = pos;
cprm->written += n;
return 0;
file->f_pos = pos;
cprm->written += n;
+ cprm->pos += n;
nr -= n;
}
return 1;
nr -= n;
}
return 1;
@@
-808,6
+809,7
@@
int dump_skip(struct coredump_params *cprm, size_t nr)
if (dump_interrupted() ||
file->f_op->llseek(file, nr, SEEK_CUR) < 0)
return 0;
if (dump_interrupted() ||
file->f_op->llseek(file, nr, SEEK_CUR) < 0)
return 0;
+ cprm->pos += nr;
return 1;
} else {
while (nr > PAGE_SIZE) {
return 1;
} else {
while (nr > PAGE_SIZE) {
@@
-822,7
+824,7
@@
EXPORT_SYMBOL(dump_skip);
int dump_align(struct coredump_params *cprm, int align)
{
int dump_align(struct coredump_params *cprm, int align)
{
- unsigned mod = cprm->
file->f_
pos & (align - 1);
+ unsigned mod = cprm->pos & (align - 1);
if (align & (align - 1))
return 0;
return mod ? dump_skip(cprm, align - mod) : 1;
if (align & (align - 1))
return 0;
return mod ? dump_skip(cprm, align - mod) : 1;