[PATCH] remove #ifdef CONFIG_PROC_FS from ipc/sem.c

• Next message: Jamie Harris: "Failing to allocated file handles?"
• Previous message: Carlos E. Gorges: "[PATCH] 2.5.69 - vsyscall DSO implementation require as/binutils >= 2.12"
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

Remove #ifdef CONFIG_PROC_FS from a couple of place in ipc/sem.c, as
they aren't needed and #ifdefs are ugly.

[also make a couple of lines fit in 80 chars]

diff -Naur --exclude-from /home/mulix/dontdiff vanilla/ipc/sem.c 2.5.69-ipc/ipc/sem.c
--- vanilla/ipc/sem.c 2003-05-05 02:53:12.000000000 +0300
+++ 2.5.69-ipc/ipc/sem.c 2003-05-06 11:34:41.000000000 +0300
@@ -80,9 +80,8 @@
 
 static int newary (key_t, int, int);
 static void freeary (int id);
-#ifdef CONFIG_PROC_FS
-static int sysvipc_sem_read_proc(char *buffer, char **start, off_t offset, int length, int *eof, void *data);
-#endif
+static int sysvipc_sem_read_proc(char *buffer, char **start, off_t offset,
+ int length, int *eof, void *data);
 
 #define SEMMSL_FAST 256 /* 512 bytes on stack */
 #define SEMOPM_FAST 64 /* ~ 372 bytes on stack */
@@ -109,9 +108,7 @@
         used_sems = 0;
         ipc_init_ids(&sem_ids,sc_semmni);
 
-#ifdef CONFIG_PROC_FS
         create_proc_read_entry("sysvipc/sem", 0, 0, sysvipc_sem_read_proc, NULL);
-#endif
 }
 
 static int newary (key_t key, int nsems, int semflg)
@@ -1292,21 +1289,23 @@
         unlock_kernel();
 }
 
-#ifdef CONFIG_PROC_FS
-static int sysvipc_sem_read_proc(char *buffer, char **start, off_t offset, int length, int *eof, void *data)
+static int sysvipc_sem_read_proc(char *buffer, char **start, off_t offset,
+ int length, int *eof, void *data)
 {
         off_t pos = 0;
         off_t begin = 0;
         int i, len = 0;
 
- len += sprintf(buffer, " key semid perms nsems uid gid cuid cgid otime ctime\n");
+ len += sprintf(buffer, " key semid perms nsems "
+ "uid gid cuid cgid otime ctime\n");
         down(&sem_ids.sem);
 
         for(i = 0; i <= sem_ids.max_id; i++) {
                 struct sem_array *sma;
                 sma = sem_lock(i);
                 if(sma) {
- len += sprintf(buffer + len, "%10d %10d %4o %10lu %5u %5u %5u %5u %10lu %10lu\n",
+ len += sprintf(buffer + len, "%10d %10d %4o %10lu "
+ "%5u %5u %5u %5u %10lu %10lu\n",
                                 sma->sem_perm.key,
                                 sem_buildid(i,sma->sem_perm.seq),
                                 sma->sem_perm.mode,
@@ -1339,4 +1338,3 @@
                 len = 0;
         return len;
 }
-#endif

-- 
Muli Ben-Yehuda
http://www.mulix.org

• application/pgp-signature attachment: stored

• Next message: Jamie Harris: "Failing to allocated file handles?"
• Previous message: Carlos E. Gorges: "[PATCH] 2.5.69 - vsyscall DSO implementation require as/binutils >= 2.12"
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

This archive was generated by hypermail 2b29 : Wed May 07 2003 - 22:00:25 EST