/proc/*/task getdents fixlet
[third time Linus's email should written right]
Linus, please from
git://git.kernel.org/pub/scm/linux/kernel/git/adobriyan/proc.git proc-linus
to get the following patch:
Zhang Le (1):
proc: update ->f_pos correctly in proc_task_readdir()
fs/proc/base.c | 16 +++++++---------
1 file changed, 7 insertions(+), 9 deletions(-)
fs/proc/base.c +7 -9
@@ -3066,7 +3066,6 @@ static int proc_task_readdir(struct file * filp, void * dirent, filldir_t filldiint retval = -ENOENT ;ino_t ino;int tid; -unsigned long pos = filp->f_pos;/* avoiding "long long" filp->f_pos */ struct pid_namespace *ns; task =get_proc_task (inode);
@@ -3083,18 +3082,18 @@ static int proc_task_readdir(struct file * filp, void * dirent, filldir_t filldi goto out_no_task; retval =0 ; -switch (pos) { +switch ((unsigned long )filp->f_pos) {case 0 : ino = inode->i_ino; -if (filldir (dirent,"." ,1 , pos, ino,DT_DIR ) <0 ) +if (filldir (dirent,"." ,1 , filp->f_pos, ino,DT_DIR ) <0 ) goto out; - pos++; + filp->f_pos++;/* fall through */ case 1 : ino =parent_ino (dentry); -if (filldir (dirent,".." ,2 , pos, ino,DT_DIR ) <0 ) +if (filldir (dirent,".." ,2 , filp->f_pos, ino,DT_DIR ) <0 ) goto out; - pos++; + filp->f_pos++;/* fall through */ }
@@ -3104,9 +3103,9 @@ static int proc_task_readdir(struct file * filp, void * dirent, filldir_t filldi ns = filp->f_dentry->d_sb->s_fs_info; tid = (int )filp->f_version; filp->f_version =0 ; -for (task =first_tid (leader, tid, pos -2 , ns); +for (task =first_tid (leader, tid, filp->f_pos -2 , ns); task; - task =next_tid (task), pos++) { + task =next_tid (task), filp->f_pos++) { tid =task_pid_nr_ns (task, ns);if (proc_task_fill_cache (filp, dirent, filldir, task, tid) <0 ) {/* returning this tgid failed, save it as the first
@@ -3117,7 +3116,6 @@ static int proc_task_readdir(struct file * filp, void * dirent, filldir_t filldi } } out: - filp->f_pos = pos;put_task_struct (leader); out_no_task:return retval;
Quoted 9 lines · Alexey Dobriyan
Linus, please from
git://git.kernel.org/pub/scm/linux/kernel/git/adobriyan/proc.gitproc-linusto get the following patch:
Zhang Le (1):
proc: update ->f_pos correctly in proc_task_readdir()
Grr. I already took the previous patch.
I assume the only difference is to avoid using a "switch()" on a 64-bit variable, and just cast it to "unsigned long". No?
Linus
Quoted 10 lines · Linus Torvalds
Quoted 7 lines · Alexey Dobriyan
Linus, please from
git://git.kernel.org/pub/scm/linux/kernel/git/adobriyan/proc.gitproc-linusto get the following patch:
Quoted 7 lines
Quoted 2 lines
Zhang Le (1):
proc: update ->f_pos correctly in proc_task_readdir()Grr. I already took the previous patch.
I assume the only difference is to avoid using a "
switch()" on a 64-bit variable, and just cast it to "unsigned long". No?
Yes,
+ switch ((unsigned long)filp->f_pos) {Quoted 8 lines · Alexey Dobriyan
Quoted 3 lines · Linus Torvalds
I assume the only difference is to avoid using a "
switch()" on a 64-bit variable, and just cast it to "unsigned long". No?Yes,
+ switch ((unsigned long)filp->f_pos) {
Ok, I'll do just that one by hand.
Linus