diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2013-01-23 17:07:38 -0500 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2013-02-22 23:31:31 -0500 |
commit | 496ad9aa8ef448058e36ca7a787c61f2e63f0f54 (patch) | |
tree | 8f4abde793cd7db5bb8fde6d27ebcacd0e54379a /drivers/watchdog | |
parent | 57eccb830f1cc93d4b506ba306d8dfa685e0c88f (diff) |
new helper: file_inode(file)
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'drivers/watchdog')
-rw-r--r-- | drivers/watchdog/cpwd.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/watchdog/cpwd.c b/drivers/watchdog/cpwd.c index 11d55ce5ca81..70387582843f 100644 --- a/drivers/watchdog/cpwd.c +++ b/drivers/watchdog/cpwd.c | |||
@@ -411,7 +411,7 @@ static long cpwd_ioctl(struct file *file, unsigned int cmd, unsigned long arg) | |||
411 | .identity = DRIVER_NAME, | 411 | .identity = DRIVER_NAME, |
412 | }; | 412 | }; |
413 | void __user *argp = (void __user *)arg; | 413 | void __user *argp = (void __user *)arg; |
414 | struct inode *inode = file->f_path.dentry->d_inode; | 414 | struct inode *inode = file_inode(file); |
415 | int index = iminor(inode) - WD0_MINOR; | 415 | int index = iminor(inode) - WD0_MINOR; |
416 | struct cpwd *p = cpwd_device; | 416 | struct cpwd *p = cpwd_device; |
417 | int setopt = 0; | 417 | int setopt = 0; |
@@ -499,7 +499,7 @@ static long cpwd_compat_ioctl(struct file *file, unsigned int cmd, | |||
499 | static ssize_t cpwd_write(struct file *file, const char __user *buf, | 499 | static ssize_t cpwd_write(struct file *file, const char __user *buf, |
500 | size_t count, loff_t *ppos) | 500 | size_t count, loff_t *ppos) |
501 | { | 501 | { |
502 | struct inode *inode = file->f_path.dentry->d_inode; | 502 | struct inode *inode = file_inode(file); |
503 | struct cpwd *p = cpwd_device; | 503 | struct cpwd *p = cpwd_device; |
504 | int index = iminor(inode); | 504 | int index = iminor(inode); |
505 | 505 | ||