From 263e944996efad16e0ac9009b9cd4137b29b4300 Mon Sep 17 00:00:00 2001 From: Andrew Morton Date: Wed, 27 Feb 2013 17:03:22 -0800 Subject: [PATCH] --- yaml --- r: 359295 b: refs/heads/master c: 5e62adef9e1d3e8e26dfd6c95be484b955ad2927 h: refs/heads/master i: 359293: e6e5ff6e805ff87220d7af41b06b4500813c7399 359291: a72f3f0d4f35eec4e6435fec4832d1b942adbbde 359287: 7c5319e650a19a70ad24ff457ad4d662e1988561 359279: 7e4dbef9edf0020554663400951b53572e5045c4 359263: c11aeb55a7019f07a974905d6f30f0bd11a2e0aa 359231: 963d80a038f090b203633f9d950c34ae03527c0f 359167: 417edc18132c1d9a5e10fd271a66f238ce2f02dc v: v3 --- [refs] | 2 +- trunk/fs/seq_file.c | 40 ++++++++++++++++++++-------------------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/[refs] b/[refs] index 587c24ae325a..815faed8ebc7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 80de7f7ae013b1e287059f39eaba2a12219681cf +refs/heads/master: 5e62adef9e1d3e8e26dfd6c95be484b955ad2927 diff --git a/trunk/fs/seq_file.c b/trunk/fs/seq_file.c index 11ba05608818..15c6304bab71 100644 --- a/trunk/fs/seq_file.c +++ b/trunk/fs/seq_file.c @@ -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);