lkml.org 
[lkml]   [2004]   [Nov]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Subject[patch] inotify: misc. style cleanup
From
Date
John!

Misc. style clean up.

Robert Love


misc. style cleanup

Signed-Off-By: Robert Love <rml@novell.com>

drivers/char/inotify.c | 46 ++++++++++++++++------------------------------
1 files changed, 16 insertions(+), 30 deletions(-)

diff -urN linux-2.6.10-rc1-inotify/drivers/char/inotify.c linux/drivers/char/inotify.c
--- linux-2.6.10-rc1-inotify/drivers/char/inotify.c 2004-11-01 15:04:12.039747832 -0500
+++ linux/drivers/char/inotify.c 2004-11-01 15:38:22.277064384 -0500
@@ -80,21 +80,20 @@
#define inotify_watch_i_list(pos) list_entry((pos), struct inotify_watch, i_list)
#define inotify_watch_u_list(pos) list_entry((pos), struct inotify_watch, u_list)

-static ssize_t show_max_queued_events (struct device *dev, char *buf)
+static ssize_t show_max_queued_events(struct device *dev, char *buf)
{
sprintf(buf, "%d", sysfs_attrib_max_queued_events);
-
- return strlen(buf)+1;
+ return strlen(buf) + 1;
}

-static ssize_t store_max_queued_events (struct device *dev,
- const char *buf,
- size_t count)
+static ssize_t store_max_queued_events(struct device *dev, const char *buf,
+ size_t count)
{
return 0;
}

-static DEVICE_ATTR(max_queued_events, S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH, show_max_queued_events, store_max_queued_events);
+static DEVICE_ATTR(max_queued_events, S_IRUGO | S_IWUSR, show_max_queued_events,
+ store_max_queued_events);

static struct device_attribute *inotify_device_attrs[] = {
&dev_attr_max_queued_events,
@@ -203,9 +202,7 @@
{
struct inotify_kernel_event *kevent, *last;

- /*
- * Check if the new event is a duplicate of the last event queued.
- */
+ /* check if the new event is a duplicate of the last event queued. */
last = inotify_dev_get_event(dev);
if (dev->event_count && last->event.mask == mask &&
last->event.wd == watch->wd) {
@@ -272,17 +269,16 @@
* This function can sleep.
*/
static int inotify_dev_get_wd(struct inotify_device *dev,
- struct inotify_watch *watch)
+ struct inotify_watch *watch)
{
int ret;

- if (!dev || !watch || dev->nr_watches >= current->signal->rlim[RLIMIT_IWATCHES].rlim_cur)
+ if (dev->nr_watches >= current->rlim[RLIMIT_IWATCHES].rlim_cur)
return -1;

repeat:
- if (!idr_pre_get(&dev->idr, GFP_KERNEL)) {
+ if (!idr_pre_get(&dev->idr, GFP_KERNEL))
return -ENOSPC;
- }
spin_lock(&dev->lock);
ret = idr_get_new(&dev->idr, watch, &watch->wd);
spin_unlock(&dev->lock);
@@ -394,9 +390,8 @@
struct inotify_watch *watch;

list_for_each_entry(watch, &dev->watches, d_list) {
- if (watch->inode == inode) {
+ if (watch->inode == inode)
return 1;
- }
}

return 0;
@@ -410,9 +405,8 @@
static int inotify_dev_add_watch(struct inotify_device *dev,
struct inotify_watch *watch)
{
- if (!dev || !watch) {
+ if (!dev || !watch)
return -EINVAL;
- }

list_add(&watch->d_list, &dev->watches);
return 0;
@@ -477,9 +471,7 @@
}

if (inode_find_dev (inode, watch->dev))
- {
return -EINVAL;
- }

list_add(&watch->i_list, &inode->inotify_data->watches);
inode->inotify_data->watch_count++;
@@ -678,7 +670,7 @@
if (count < event_size)
return -EINVAL;

- while(1) {
+ while (1) {
int has_events;

spin_lock(&dev->lock);
@@ -760,9 +752,8 @@
{
struct inotify_watch *watch,*next;

- list_for_each_entry_safe(watch, next, &dev->watches, d_list) {
+ list_for_each_entry_safe(watch, next, &dev->watches, d_list)
ignore_helper(watch, 0);
- }
}

/*
@@ -797,9 +788,8 @@
int ret;

inode = find_inode(request->dirname);
- if (IS_ERR(inode)) {
+ if (IS_ERR(inode))
return PTR_ERR(inode);
- }

spin_lock(&inode->i_lock);
spin_lock(&dev->lock);
@@ -934,9 +924,7 @@
sysfs_attrib_max_queued_events = 16384;

for (i = 0;inotify_device_attrs[i];i++)
- {
- device_create_file (inotify_device.dev, inotify_device_attrs[i]);
- }
+ device_create_file(inotify_device.dev, inotify_device_attrs[i]);

atomic_set(&watch_count, 0);
atomic_set(&inotify_cookie, 0);
@@ -958,6 +946,4 @@
return 0;
}

-
-
module_init(inotify_init);

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

\
 
 \ /
  Last update: 2005-03-22 14:07    [W:0.099 / U:0.300 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site