git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
drivers
/
char
/
dtlk.c
diff --git
a/drivers/char/dtlk.c
b/drivers/char/dtlk.c
index
5e82c3b
..
d4005e9
100644
(file)
--- a/
drivers/char/dtlk.c
+++ b/
drivers/char/dtlk.c
@@
-122,7
+122,7
@@
static void dtlk_timer_tick(unsigned long data);
static ssize_t dtlk_read(struct file *file, char __user *buf,
size_t count, loff_t * ppos)
{
static ssize_t dtlk_read(struct file *file, char __user *buf,
size_t count, loff_t * ppos)
{
- unsigned int minor = iminor(file->f_dentry->d_inode);
+ unsigned int minor = iminor(file->f_
path.
dentry->d_inode);
char ch;
int i = 0, retries;
char ch;
int i = 0, retries;
@@
-174,7
+174,7
@@
static ssize_t dtlk_write(struct file *file, const char __user *buf,
}
#endif
}
#endif
- if (iminor(file->f_dentry->d_inode) != DTLK_MINOR)
+ if (iminor(file->f_
path.
dentry->d_inode) != DTLK_MINOR)
return -EINVAL;
while (1) {
return -EINVAL;
while (1) {