diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-09-28 08:29:59 -0400 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-09-28 08:29:59 -0400 |
| commit | 185a257f2f73bcd89050ad02da5bedbc28fc43fa (patch) | |
| tree | 5e32586114534ed3f2165614cba3d578f5d87307 /kernel/relay.c | |
| parent | 3f1a9aaeffd8d1cbc5ab9776c45cbd66af1c9699 (diff) | |
| parent | a77c64c1a641950626181b4857abb701d8f38ccc (diff) | |
Merge branch 'master' into gfs2
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 | ||