[RFC: 2.6 patch] fs/inotify.c: possible cleanups

[RFC: 2.6 patch] fs/inotify.c: possible cleanups

[Adrian Bunk]

This patch contains the following possible cleanups:
- make the following needlessly global variables static:
  - inotify_max_user_instances
  - inotify_max_user_watches
  - inotify_max_queued_events
- remove the following unused EXPORT_SYMBOL_GPL's:
  - inotify_get_cookie
  - inotify_unmount_inodes
  - inotify_inode_is_dead

Signed-off-by: Adrian Bunk <bunk@stusta.de>

---

 fs/inotify.c |    9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

--- linux-2.6.17-rc1-mm3-full/fs/inotify.c.old	2006-04-23 12:12:52.000000000 +0200
+++ linux-2.6.17-rc1-mm3-full/fs/inotify.c	2006-04-23 12:18:46.000000000 +0200
@@ -45,9 +45,9 @@
 static struct vfsmount *inotify_mnt __read_mostly;
 
 /* these are configurable via /proc/sys/fs/inotify/ */
-int inotify_max_user_instances __read_mostly;
-int inotify_max_user_watches __read_mostly;
-int inotify_max_queued_events __read_mostly;
+static int inotify_max_user_instances __read_mostly;
+static int inotify_max_user_watches __read_mostly;
+static int inotify_max_queued_events __read_mostly;
 
 /*
  * Lock ordering:
@@ -627,7 +627,6 @@
 {
 	return atomic_inc_return(&inotify_cookie);
 }
-EXPORT_SYMBOL_GPL(inotify_get_cookie);
 
 /**
  * inotify_unmount_inodes - an sb is unmounting.  handle any watched inodes.
@@ -706,7 +705,6 @@
 		spin_lock(&inode_lock);
 	}
 }
-EXPORT_SYMBOL_GPL(inotify_unmount_inodes);
 
 /**
  * inotify_inode_is_dead - an inode has been deleted, cleanup any watches
@@ -725,7 +723,6 @@
 	}
 	mutex_unlock(&inode->inotify_mutex);
 }
-EXPORT_SYMBOL_GPL(inotify_inode_is_dead);
 
 /* Device Interface */
 

Re: [RFC: 2.6 patch] fs/inotify.c: possible cleanups

[John McCutchan]

Looks good.



On Sun, 2006-04-23 at 13:47 +0200, Adrian Bunk wrote:
> This patch contains the following possible cleanups:
> - make the following needlessly global variables static:
>   - inotify_max_user_instances
>   - inotify_max_user_watches
>   - inotify_max_queued_events
> - remove the following unused EXPORT_SYMBOL_GPL's:
>   - inotify_get_cookie
>   - inotify_unmount_inodes
>   - inotify_inode_is_dead
> 
> Signed-off-by: Adrian Bunk <bunk@stusta.de>
> 
> ---
> 
>  fs/inotify.c |    9 +++------
>  1 file changed, 3 insertions(+), 6 deletions(-)
> 
> --- linux-2.6.17-rc1-mm3-full/fs/inotify.c.old	2006-04-23 12:12:52.000000000 +0200
> +++ linux-2.6.17-rc1-mm3-full/fs/inotify.c	2006-04-23 12:18:46.000000000 +0200
> @@ -45,9 +45,9 @@
>  static struct vfsmount *inotify_mnt __read_mostly;
>  
>  /* these are configurable via /proc/sys/fs/inotify/ */
> -int inotify_max_user_instances __read_mostly;
> -int inotify_max_user_watches __read_mostly;
> -int inotify_max_queued_events __read_mostly;
> +static int inotify_max_user_instances __read_mostly;
> +static int inotify_max_user_watches __read_mostly;
> +static int inotify_max_queued_events __read_mostly;
>  
>  /*
>   * Lock ordering:
> @@ -627,7 +627,6 @@
>  {
>  	return atomic_inc_return(&inotify_cookie);
>  }
> -EXPORT_SYMBOL_GPL(inotify_get_cookie);
>  
>  /**
>   * inotify_unmount_inodes - an sb is unmounting.  handle any watched inodes.
> @@ -706,7 +705,6 @@
>  		spin_lock(&inode_lock);
>  	}
>  }
> -EXPORT_SYMBOL_GPL(inotify_unmount_inodes);
>  
>  /**
>   * inotify_inode_is_dead - an inode has been deleted, cleanup any watches
> @@ -725,7 +723,6 @@
>  	}
>  	mutex_unlock(&inode->inotify_mutex);
>  }
> -EXPORT_SYMBOL_GPL(inotify_inode_is_dead);
>  
>  /* Device Interface */
>  
> 
> 
-- 
John McCutchan <john@johnmccutchan.com>