Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 54579
b: refs/heads/master
c: 59cd0cb
h: refs/heads/master
i:
  54577: c73ae83
  54575: d781d05
v: v3
  • Loading branch information
Darrick J. Wong authored and Linus Torvalds committed May 8, 2007
1 parent 462fd93 commit 47a8c6d
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 3 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: 7695650a924a6859910c8c19dfa43b4d08224d66
refs/heads/master: 59cd0cbc75367b82f704f63b104117462275060d
11 changes: 9 additions & 2 deletions trunk/fs/proc/generic.c
Original file line number Diff line number Diff line change
Expand Up @@ -478,14 +478,21 @@ int proc_readdir(struct file * filp,
}

do {
struct proc_dir_entry *next;

/* filldir passes info to user space */
de_get(de);
spin_unlock(&proc_subdir_lock);
if (filldir(dirent, de->name, de->namelen, filp->f_pos,
de->low_ino, de->mode >> 12) < 0)
de->low_ino, de->mode >> 12) < 0) {
de_put(de);
goto out;
}
spin_lock(&proc_subdir_lock);
filp->f_pos++;
de = de->next;
next = de->next;
de_put(de);
de = next;
} while (de);
spin_unlock(&proc_subdir_lock);
}
Expand Down

0 comments on commit 47a8c6d

Please sign in to comment.