diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-09-27 18:13:53 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-09-27 18:13:53 -0400 |
| commit | aebb1153ac54ddbbd3d3f0481a193f4bf0ead53b (patch) | |
| tree | 57425aa83c8bed5b41af7e3408024fe1f2fdded9 /kernel/relay.c | |
| parent | 022e7a12b6aa11a11de4d708fe8606c9a6734b37 (diff) | |
| parent | a77c64c1a641950626181b4857abb701d8f38ccc (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'kernel/relay.c')
| -rw-r--r-- | kernel/relay.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/relay.c b/kernel/relay.c index 33345e73485c..85786ff2a4f9 100644 --- a/kernel/relay.c +++ b/kernel/relay.c | |||
| @@ -669,7 +669,7 @@ EXPORT_SYMBOL_GPL(relay_flush); | |||
| 669 | */ | 669 | */ |
| 670 | static int relay_file_open(struct inode *inode, struct file *filp) | 670 | static int relay_file_open(struct inode *inode, struct file *filp) |
| 671 | { | 671 | { |
| 672 | struct rchan_buf *buf = inode->u.generic_ip; | 672 | struct rchan_buf *buf = inode->i_private; |
| 673 | kref_get(&buf->kref); | 673 | kref_get(&buf->kref); |
| 674 | filp->private_data = buf; | 674 | filp->private_data = buf; |
| 675 | 675 | ||