diff options
| author | Mark Brown <broonie@linaro.org> | 2013-11-13 12:06:30 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-11-13 12:06:30 +0000 |
| commit | 54a3a4d441e9eaceb86989f0b466e77815ab6129 (patch) | |
| tree | eab08ab86a34f0a071467435b42f733d1af013cf /fs/seq_file.c | |
| parent | 7c9373fbcd0b29f6ccc28407c11ecd51cfa7a3c2 (diff) | |
| parent | 3729ed7c6aa8c5b9eee8f832e4a246b8fa1d56b5 (diff) | |
Merge tag 'v3.10.19' into linux-linaro-lsk
This is the 3.10.19 stable release
Diffstat (limited to 'fs/seq_file.c')
| -rw-r--r-- | fs/seq_file.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/seq_file.c b/fs/seq_file.c index 774c1eb7f1c..3dd44db1465 100644 --- a/fs/seq_file.c +++ b/fs/seq_file.c @@ -328,6 +328,8 @@ loff_t seq_lseek(struct file *file, loff_t offset, int whence) m->read_pos = offset; retval = file->f_pos = offset; } + } else { + file->f_pos = offset; } } file->f_version = m->version; |