[svn-commits] tzafrir: linux/trunk r6642 - /linux/trunk/drivers/dahdi/xpp/

[SVN commits to the Digium repositories]

Author: tzafrir
Date: Tue May 19 11:09:06 2009
New Revision: 6642

URL: http://svn.asterisk.org/svn-view/dahdi?view=rev&rev=6642
Log:
xpp: 'owner' property of procfs was dropped in 2.6.30.

This adds a compatibility macro for older versions that is a noop for
kernels >= 2.6.30.

(closes issue #14964)

Modified:
    linux/trunk/drivers/dahdi/xpp/xbus-core.c
    linux/trunk/drivers/dahdi/xpp/xdefs.h
    linux/trunk/drivers/dahdi/xpp/xpp_dahdi.c
    linux/trunk/drivers/dahdi/xpp/xpp_usb.c

Modified: linux/trunk/drivers/dahdi/xpp/xbus-core.c
URL: http://svn.asterisk.org/svn-view/dahdi/linux/trunk/drivers/dahdi/xpp/xbus-core.c?view=diff&rev=6642&r1=6641&r2=6642
==============================================================================
--- linux/trunk/drivers/dahdi/xpp/xbus-core.c (original)
+++ linux/trunk/drivers/dahdi/xpp/xbus-core.c Tue May 19 11:09:06 2009
@@ -1087,7 +1087,7 @@
 			XBUS_ERR(xbus, "Failed to create proc file '%s'\n", PROC_XBUS_WAITFOR_XPDS);
 			goto err;
 		}
-		worker->proc_xbus_waitfor_xpds->owner = THIS_MODULE;
+		SET_PROC_DIRENTRY_OWNER(worker->proc_xbus_waitfor_xpds);
 	}
 #endif
 #endif
@@ -1398,7 +1398,7 @@
 		err = -EIO;
 		goto nobus;
 	}
-	xbus->proc_xbus_summary->owner = THIS_MODULE;
+	SET_PROC_DIRENTRY_OWNER(xbus->proc_xbus_summary);
 #ifdef	PROTOCOL_DEBUG
 	xbus->proc_xbus_command = create_proc_entry(PROC_XBUS_COMMAND, 0200, xbus->proc_xbus_dir);
 	if (!xbus->proc_xbus_command) {
@@ -1408,7 +1408,7 @@
 	}
 	xbus->proc_xbus_command->write_proc = proc_xbus_command_write;
 	xbus->proc_xbus_command->data = xbus;
-	xbus->proc_xbus_command->owner = THIS_MODULE;
+	SET_PROC_DIRENTRY_OWNER(xbus->proc_xbus_command);
 #endif
 #endif
 #ifdef	XPP_DEBUGFS
@@ -1857,7 +1857,7 @@
 		ret = -EFAULT;
 		goto err;
 	}
-	proc_xbuses->owner = THIS_MODULE;
+	SET_PROC_DIRENTRY_OWNER(proc_xbuses);
 #endif
 #ifdef	XPP_DEBUGFS
 	DBG(GENERAL, "Creating debugfs xpp root\n");

Modified: linux/trunk/drivers/dahdi/xpp/xdefs.h
URL: http://svn.asterisk.org/svn-view/dahdi/linux/trunk/drivers/dahdi/xpp/xdefs.h?view=diff&rev=6642&r1=6641&r2=6642
==============================================================================
--- linux/trunk/drivers/dahdi/xpp/xdefs.h (original)
+++ linux/trunk/drivers/dahdi/xpp/xdefs.h Tue May 19 11:09:06 2009
@@ -143,6 +143,11 @@
 #define dev_set_name(dev, format, ...) \
 	snprintf((dev)->bus_id, BUS_ID_SIZE, format, ## __VA_ARGS__);
 #endif
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)
+#define	SET_PROC_DIRENTRY_OWNER(p)	do { (p)->owner = THIS_MODULE; } while(0);
+#else
+#define	SET_PROC_DIRENTRY_OWNER(p)	do { } while(0);
+#endif
 
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)
 /* Also don't define this for later RHEL >= 5.2 . hex_asc is from the 

Modified: linux/trunk/drivers/dahdi/xpp/xpp_dahdi.c
URL: http://svn.asterisk.org/svn-view/dahdi/linux/trunk/drivers/dahdi/xpp/xpp_dahdi.c?view=diff&rev=6642&r1=6641&r2=6642
==============================================================================
--- linux/trunk/drivers/dahdi/xpp/xpp_dahdi.c (original)
+++ linux/trunk/drivers/dahdi/xpp/xpp_dahdi.c Tue May 19 11:09:06 2009
@@ -190,14 +190,14 @@
 		XPD_ERR(xpd, "Failed to create proc file '%s'\n", PROC_XPD_SUMMARY);
 		goto err;
 	}
-	xpd->proc_xpd_summary->owner = THIS_MODULE;
+	SET_PROC_DIRENTRY_OWNER(xpd->proc_xpd_summary);
 #ifdef	OLD_PROC
 	xpd->proc_xpd_ztregister = create_proc_entry(PROC_XPD_ZTREGISTER, 0644, xpd->proc_xpd_dir);
 	if (!xpd->proc_xpd_ztregister) {
 		XPD_ERR(xpd, "Failed to create proc file '%s'\n", PROC_XPD_ZTREGISTER);
 		goto err;
 	}
-	xpd->proc_xpd_ztregister->owner = THIS_MODULE;
+	SET_PROC_DIRENTRY_OWNER(xpd->proc_xpd_ztregister);
 	xpd->proc_xpd_ztregister->data = xpd;
 	xpd->proc_xpd_ztregister->read_proc = proc_xpd_ztregister_read;
 	xpd->proc_xpd_ztregister->write_proc = proc_xpd_ztregister_write;
@@ -206,7 +206,7 @@
 		XPD_ERR(xpd, "Failed to create proc file '%s'\n", PROC_XPD_BLINK);
 		goto err;
 	}
-	xpd->proc_xpd_blink->owner = THIS_MODULE;
+	SET_PROC_DIRENTRY_OWNER(xpd->proc_xpd_blink);
 	xpd->proc_xpd_blink->data = xpd;
 	xpd->proc_xpd_blink->read_proc = proc_xpd_blink_read;
 	xpd->proc_xpd_blink->write_proc = proc_xpd_blink_write;

Modified: linux/trunk/drivers/dahdi/xpp/xpp_usb.c
URL: http://svn.asterisk.org/svn-view/dahdi/linux/trunk/drivers/dahdi/xpp/xpp_usb.c?view=diff&rev=6642&r1=6641&r2=6642
==============================================================================
--- linux/trunk/drivers/dahdi/xpp/xpp_usb.c (original)
+++ linux/trunk/drivers/dahdi/xpp/xpp_usb.c Tue May 19 11:09:06 2009
@@ -755,7 +755,7 @@
 		retval = -EIO;
 		goto probe_failed;
 	}
-	procsummary->owner = THIS_MODULE;
+	SET_PROC_DIRENTRY_OWNER(procsummary);
 #endif
 	bus_count++;
 	xusb->xbus_num = xbus->num;