Re: [RFC][PATCH] inotify 0.9.2

[Robert Love]

On Sun, 2004-09-19 at 23:56 -0400, John McCutchan wrote:

> I would appreciate design review, code review and testing.

Hi, John.

Attached patches fixes two compile warnings I receive in
drivers/char/inotify.c:

	- Declaration after code in inotify_watch()

	- Uncasted conversion from pointer to integer

Also, wrap some arithmetic in parenthesis, to be safe.

Best,

	Robert Love

Fix a couple misc. compile warnings in inotify.c
Signed-Off-By: Robert Love <rml@xxxxxxxxxx>

 drivers/char/inotify.c |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

--- linux-inotify/drivers/char/inotify.c	2004-09-21 00:58:03.912389824 -0400
+++ linux/drivers/char/inotify.c	2004-09-21 01:24:07.042757888 -0400
@@ -45,7 +45,7 @@
 #define MAX_INOTIFY_QUEUED_EVENTS 256 /* Only the first Z events will be queued */
 #define __BITMASK_SIZE (MAX_INOTIFY_DEV_WATCHERS / 8)
 
-#define INOTIFY_DEV_TIMER_TIME jiffies + (HZ/4)
+#define INOTIFY_DEV_TIMER_TIME	(jiffies + (HZ/4))
 
 static atomic_t watcher_count; // < MAX_INOTIFY_DEVS
 
@@ -668,7 +668,7 @@
 
 	file->private_data = dev;
 
-	dev->timer.data = dev;
+	dev->timer.data = (unsigned long) dev;
 	dev->timer.function = inotify_dev_timer;
 	dev->timer.expires = INOTIFY_DEV_TIMER_TIME;
 
@@ -745,8 +745,10 @@
 	 * watching, we just update the mask and return 0
 	 */
 	if (inotify_dev_is_watching_inode (dev, inode)) {
-		iprintk(INOTIFY_DEBUG_ERRORS, "adjusting event mask for inode %p\n", inode);
-		struct inotify_watcher *owatcher; // the old watcher
+		struct inotify_watcher *owatcher;	/* the old watcher */
+
+		iprintk(INOTIFY_DEBUG_ERRORS,
+				"adjusting event mask for inode %p\n", inode);
 
 		owatcher = inode_find_dev (inode, dev);