Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 359295
b: refs/heads/master
c: 5e62ade
h: refs/heads/master
i:
  359293: e6e5ff6
  359291: a72f3f0
  359287: 7c5319e
  359279: 7e4dbef
  359263: c11aeb5
  359231: 963d80a
  359167: 417edc1
v: v3
  • Loading branch information
Andrew Morton authored and Linus Torvalds committed Feb 28, 2013
1 parent 9a55127 commit 263e944
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 21 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 80de7f7ae013b1e287059f39eaba2a12219681cf
refs/heads/master: 5e62adef9e1d3e8e26dfd6c95be484b955ad2927
40 changes: 20 additions & 20 deletions trunk/fs/seq_file.c
Original file line number Diff line number Diff line change
Expand Up @@ -308,27 +308,27 @@ loff_t seq_lseek(struct file *file, loff_t offset, int whence)
mutex_lock(&m->lock);
m->version = file->f_version;
switch (whence) {
case SEEK_CUR:
offset += file->f_pos;
case SEEK_SET:
if (offset < 0)
break;
retval = offset;
if (offset != m->read_pos) {
while ((retval=traverse(m, offset)) == -EAGAIN)
;
if (retval) {
/* with extreme prejudice... */
file->f_pos = 0;
m->read_pos = 0;
m->version = 0;
m->index = 0;
m->count = 0;
} else {
m->read_pos = offset;
retval = file->f_pos = offset;
}
case SEEK_CUR:
offset += file->f_pos;
case SEEK_SET:
if (offset < 0)
break;
retval = offset;
if (offset != m->read_pos) {
while ((retval = traverse(m, offset)) == -EAGAIN)
;
if (retval) {
/* with extreme prejudice... */
file->f_pos = 0;
m->read_pos = 0;
m->version = 0;
m->index = 0;
m->count = 0;
} else {
m->read_pos = offset;
retval = file->f_pos = offset;
}
}
}
file->f_version = m->version;
mutex_unlock(&m->lock);
Expand Down

0 comments on commit 263e944

Please sign in to comment.