[patch] patch for change from "f_dentry" to "f_path.dentry"

lirc-0.9.0-kernel-3.19-fix-f_dentry.patch (text/plain), 1.84 KB, created by Atlant on 2015-06-14 12:09:34 UTC

diff -Nudr lirc-0.9.0-orig/drivers/lirc_dev/lirc_dev.c lirc-0.9.0/drivers/lirc_dev/lirc_dev.c
--- lirc-0.9.0-orig/drivers/lirc_dev/lirc_dev.c	2011-03-26 05:28:18.000000000 +0700
+++ lirc-0.9.0/drivers/lirc_dev/lirc_dev.c	2015-06-14 18:48:56.933334153 +0700
@@ -620,7 +620,7 @@
 
 unsigned int lirc_dev_fop_poll(struct file *file, poll_table *wait)
 {
-	struct irctl *ir = irctls[iminor(file->f_dentry->d_inode)];
+	struct irctl *ir = irctls[iminor(file->f_path.dentry->d_inode)];
 	unsigned int ret;
 
 	if (!ir) {
@@ -666,7 +666,7 @@
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 35)
 	struct irctl *ir = irctls[iminor(inode)];
 #else
-	struct irctl *ir = irctls[iminor(file->f_dentry->d_inode)];
+	struct irctl *ir = irctls[iminor(file->f_path.dentry->d_inode)];
 #endif
 	if (!ir) {
 		printk(KERN_ERR "lirc_dev: %s: no irctl found!\n", __func__);
@@ -751,7 +751,7 @@
 			  size_t length,
 			  loff_t *ppos)
 {
-	struct irctl *ir = irctls[iminor(file->f_dentry->d_inode)];
+	struct irctl *ir = irctls[iminor(file->f_path.dentry->d_inode)];
 	unsigned char *buf;
 	int ret = 0, written = 0;
 	DECLARE_WAITQUEUE(wait, current);
@@ -852,10 +852,10 @@
 {
 	void *data = NULL;
 
-	if (file && file->f_dentry && file->f_dentry->d_inode &&
-	    file->f_dentry->d_inode->i_rdev) {
+	if (file && file->f_path.dentry && file->f_path.dentry->d_inode &&
+	    file->f_path.dentry->d_inode->i_rdev) {
 		struct irctl *ir;
-		ir = irctls[iminor(file->f_dentry->d_inode)];
+		ir = irctls[iminor(file->f_path.dentry->d_inode)];
 		data = ir->d.data;
 	}
 
@@ -867,7 +867,7 @@
 ssize_t lirc_dev_fop_write(struct file *file, const char *buffer,
 			   size_t length, loff_t *ppos)
 {
-	struct irctl *ir = irctls[iminor(file->f_dentry->d_inode)];
+	struct irctl *ir = irctls[iminor(file->f_path.dentry->d_inode)];
 
 	if (!ir) {
 		printk(KERN_ERR "%s: called with invalid irctl\n", __func__);