diff options
| author | Jeff Garzik <jeff@garzik.org> | 2007-02-17 15:11:43 -0500 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2007-02-17 15:11:43 -0500 |
| commit | f630fe2817601314b2eb7ca5ddc23c7834646731 (patch) | |
| tree | 3bfb4939b7bbc3859575ca8b58fa3f929b015941 /fs/proc/inode.c | |
| parent | 48c871c1f6a7c7044dd76774fb469e65c7e2e4e8 (diff) | |
| parent | 8a03d9a498eaf02c8a118752050a5154852c13bf (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'fs/proc/inode.c')
| -rw-r--r-- | fs/proc/inode.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/proc/inode.c b/fs/proc/inode.c index f6722be37dde..c372eb151a3a 100644 --- a/fs/proc/inode.c +++ b/fs/proc/inode.c | |||
| @@ -161,6 +161,7 @@ struct inode *proc_get_inode(struct super_block *sb, unsigned int ino, | |||
| 161 | if (!inode) | 161 | if (!inode) |
| 162 | goto out_ino; | 162 | goto out_ino; |
| 163 | 163 | ||
| 164 | PROC_I(inode)->fd = 0; | ||
| 164 | PROC_I(inode)->pde = de; | 165 | PROC_I(inode)->pde = de; |
| 165 | if (de) { | 166 | if (de) { |
| 166 | if (de->mode) { | 167 | if (de->mode) { |