[PATCH] InterMezzo maintainence patch

I have tested these patches and can atteste that they work. - rwhron@earthlink.net: include cleanup of fs/intermezzo - kdw@neowiz.com: memory leakage problem,race condition report - Domen Puncer: Use list_for_each() where applicable - Chen Yang: include file modification for more platforms to compile intermezzo fix an oops problem

[PATCH] InterMezzo maintainence patch
I have tested these patches and can atteste that they work. - rwhron@earthlink.net: include cleanup of fs/intermezzo - kdw@neowiz.com: memory leakage problem,race condition report - Domen Puncer: Use list_for_each() where applicable - Chen Yang: include file modification for more platforms to compile intermezzo fix an oops problem
7cfb5e64 · Chen Yang · Linus Torvalds · d154c8f0 · 7cfb5e64 · 7cfb5e64
Commit 7cfb5e64 authored Oct 06, 2003 by Chen Yang Committed by Linus Torvalds Oct 06, 2003
22 changed files
--- a/fs/intermezzo/cache.c
+++ b/fs/intermezzo/cache.c
@@ -33,7 +33,6 @@
 #include <linux/sched.h>
 #include <linux/stat.h>
 #include <linux/string.h>
-#include <linux/smp_lock.h>
 #include <linux/blkdev.h>
 #include <linux/init.h>

--- a/fs/intermezzo/dcache.c
+++ b/fs/intermezzo/dcache.c
@@ -37,7 +37,6 @@
 #include <linux/fs.h>
 #include <linux/stat.h>
 #include <linux/errno.h>
-#include <linux/smp_lock.h>
 #include <linux/slab.h>
 #include <asm/segment.h>
 #include <asm/uaccess.h>

--- a/fs/intermezzo/dir.c
+++ b/fs/intermezzo/dir.c
@@ -23,10 +23,9 @@
 */
 #include <asm/bitops.h>
-#include <asm/ioctls.h>
+#include <asm/termios.h>
 #include <asm/uaccess.h>
 #include <asm/system.h>
-#include <linux/smp_lock.h>
 #include <linux/errno.h>
 #include <linux/fs.h>
@@ -55,7 +54,7 @@ static inline void presto_relock_other(struct inode *dir)
 {
        /* vfs_mkdir locks */
        //        down(&dir->i_zombie);
-        lock_kernel(); 
+        //lock_kernel(); 
 }
 static inline void presto_fulllock(struct inode *dir) 
@@ -64,13 +63,13 @@ static inline void presto_fulllock(struct inode *dir)
        down(&dir->i_sem);
        /* vfs_mkdir locks */
        //        down(&dir->i_zombie);
-        lock_kernel(); 
+        //lock_kernel(); 
 }
 static inline void presto_unlock(struct inode *dir) 
 {
        /* vfs_mkdir locks */
-        unlock_kernel(); 
+        //unlock_kernel(); 
        //        up(&dir->i_zombie);
        /* the lock from sys_mkdir / lookup_create */
        up(&dir->i_sem);

--- a/fs/intermezzo/ext_attr.c
+++ b/fs/intermezzo/ext_attr.c
@@ -28,14 +28,12 @@
 #include <linux/string.h>
 #include <linux/stat.h>
 #include <linux/errno.h>
-#include <linux/smp_lock.h>
 #include <linux/unistd.h>
 #include <asm/system.h>
 #include <asm/uaccess.h>
 #include <linux/fs.h>
-#include <linux/smp_lock.h>
 #include <linux/slab.h>
 #include <linux/vmalloc.h>
 #include <asm/segment.h>

--- a/fs/intermezzo/file.c
+++ b/fs/intermezzo/file.c
@@ -41,7 +41,6 @@
 #include <linux/sched.h>
 #include <linux/stat.h>
 #include <linux/string.h>
-#include <linux/smp_lock.h>
 #include <linux/blkdev.h>
 #include <linux/init.h>
 #include <linux/module.h>

--- a/fs/intermezzo/fileset.c
+++ b/fs/intermezzo/fileset.c
@@ -35,7 +35,6 @@
 #include <linux/sched.h>
 #include <linux/stat.h>
 #include <linux/string.h>
-#include <linux/smp_lock.h>
 #include <linux/blkdev.h>
 #include <linux/init.h>
 #include <linux/module.h>

--- a/fs/intermezzo/inode.c
+++ b/fs/intermezzo/inode.c
@@ -30,7 +30,6 @@
 #include <linux/string.h>
 #include <linux/stat.h>
 #include <linux/errno.h>
-#include <linux/smp_lock.h>
 #include <linux/unistd.h>
 #include <asm/system.h>

--- a/fs/intermezzo/journal.c
+++ b/fs/intermezzo/journal.c
@@ -33,7 +33,6 @@
 #include <linux/vmalloc.h>
 #include <linux/time.h>
 #include <linux/errno.h>
-#include <linux/smp_lock.h>
 #include <asm/segment.h>
 #include <asm/uaccess.h>
 #include <linux/string.h>

--- a/fs/intermezzo/journal_ext2.c
+++ b/fs/intermezzo/journal_ext2.c
@@ -27,7 +27,6 @@
 #include <linux/vmalloc.h>
 #include <linux/stat.h>
 #include <linux/errno.h>
-#include <linux/smp_lock.h>
 #include <asm/segment.h>
 #include <asm/uaccess.h>
 #include <linux/string.h>

--- a/fs/intermezzo/journal_ext3.c
+++ b/fs/intermezzo/journal_ext3.c
@@ -33,7 +33,6 @@
 #include <linux/vmalloc.h>
 #include <linux/stat.h>
 #include <linux/errno.h>
-#include <linux/smp_lock.h>
 #include <asm/segment.h>
 #include <asm/uaccess.h>
 #include <linux/string.h>

--- a/fs/intermezzo/journal_obdfs.c
+++ b/fs/intermezzo/journal_obdfs.c
@@ -32,7 +32,6 @@
 #include <linux/vmalloc.h>
 #include <linux/stat.h>
 #include <linux/errno.h>
-#include <linux/smp_lock.h>
 #include <asm/segment.h>
 #include <asm/uaccess.h>
 #include <linux/string.h>

--- a/fs/intermezzo/journal_reiserfs.c
+++ b/fs/intermezzo/journal_reiserfs.c
@@ -31,7 +31,6 @@
 #include <linux/vmalloc.h>
 #include <linux/stat.h>
 #include <linux/errno.h>
-#include <linux/smp_lock.h>
 #include <asm/segment.h>
 #include <asm/uaccess.h>
 #include <linux/string.h>

--- a/fs/intermezzo/journal_tmpfs.c
+++ b/fs/intermezzo/journal_tmpfs.c
@@ -33,7 +33,6 @@
 #include <linux/vmalloc.h>
 #include <linux/stat.h>
 #include <linux/errno.h>
-#include <linux/smp_lock.h>
 #include <asm/segment.h>
 #include <asm/uaccess.h>
 #include <linux/string.h>

--- a/fs/intermezzo/journal_xfs.c
+++ b/fs/intermezzo/journal_xfs.c
@@ -27,7 +27,6 @@
 #include <linux/vmalloc.h>
 #include <linux/stat.h>
 #include <linux/errno.h>
-#include <linux/smp_lock.h>
 #include <asm/segment.h>
 #include <asm/uaccess.h>
 #include <linux/string.h>

--- a/fs/intermezzo/kml_utils.c
+++ b/fs/intermezzo/kml_utils.c
 #include <linux/list.h>
 #include <linux/mm.h>
-#include <linux/smp_lock.h>
 #include <linux/slab.h>
 #include <linux/vmalloc.h>

--- a/fs/intermezzo/methods.c
+++ b/fs/intermezzo/methods.c
@@ -37,7 +37,6 @@
 #include <linux/sched.h>
 #include <linux/stat.h>
 #include <linux/string.h>
-#include <linux/smp_lock.h>
 #include <linux/blkdev.h>
 #include <linux/init.h>
 #include <linux/module.h>

--- a/fs/intermezzo/presto.c
+++ b/fs/intermezzo/presto.c
@@ -31,7 +31,6 @@
 #include <linux/errno.h>
 #include <linux/vmalloc.h>
 #include <linux/slab.h>
-#include <linux/smp_lock.h>
 #include <asm/segment.h>
 #include <asm/uaccess.h>
 #include <linux/string.h>

--- a/fs/intermezzo/psdev.c
+++ b/fs/intermezzo/psdev.c
@@ -102,8 +102,7 @@ int izo_psdev_setpid(int minor)
                struct list_head *lh;
                struct upc_req *req;
                CERROR("WARNING: setpid & processing not empty!\n");
-                lh = &channel->uc_processing;
+		list_for_each(lh, &channel->uc_processing) {
-                while ( (lh = lh->next) != &channel->uc_processing) {
                        req = list_entry(lh, struct upc_req, rq_chain);
                        /* freeing of req and data is done by the sleeper */
                        wake_up(&req->rq_sleep);
@@ -208,8 +207,7 @@ static ssize_t presto_psdev_write(struct file *file, const char *buf,
        spin_lock(&channel->uc_lock); 
        /* Look for the message on the processing queue. */
-        lh  = &channel->uc_processing;
+	list_for_each(lh, &channel->uc_processing) {
-        while ( (lh = lh->next) != &channel->uc_processing ) {
                tmp = list_entry(lh, struct upc_req , rq_chain);
                if (tmp->rq_unique == hdr.unique) {
                        req = tmp;
@@ -337,8 +335,7 @@ static int presto_psdev_release(struct inode * inode, struct file * file)
        /* Wake up clients so they can return. */
        CDEBUG(D_PSDEV, "Wake up clients sleeping for pending.\n");
        spin_lock(&channel->uc_lock); 
-        lh = &channel->uc_pending;
+	list_for_each(lh, &channel->uc_pending) {
-        while ( (lh = lh->next) != &channel->uc_pending) {
                req = list_entry(lh, struct upc_req, rq_chain);
                /* Async requests stay around for a new lento */
@@ -351,8 +348,7 @@ static int presto_psdev_release(struct inode * inode, struct file * file)
        }
        CDEBUG(D_PSDEV, "Wake up clients sleeping for processing\n");
-        lh = &channel->uc_processing;
+	list_for_each(lh, &channel->uc_processing) {
-        while ( (lh = lh->next) != &channel->uc_processing) {
                req = list_entry(lh, struct upc_req, rq_chain);
                /* freeing of req and data is done by the sleeper */
                req->rq_flags |= REQ_DEAD; 
@@ -419,7 +415,7 @@ void presto_psdev_cleanup(void)
        for ( i = 0 ; i < MAX_CHANNEL ; i++ ) {
                struct upc_channel *channel = &(izo_channels[i]);
-                struct list_head *lh;
+                struct list_head *lh, *next;
                spin_lock(&channel->uc_lock); 
                if ( ! list_empty(&channel->uc_pending)) { 
@@ -431,12 +427,10 @@ void presto_psdev_cleanup(void)
                if ( ! list_empty(&channel->uc_cache_list)) { 
                        CERROR("Weird, tell Peter: module cleanup and cache listnot empty dev %d\n", i);
                }
-                lh = channel->uc_pending.next;
+		list_for_each_safe(lh, next, &channel->uc_pending) {
-                while ( lh != &channel->uc_pending) {
                        struct upc_req *req;
                        req = list_entry(lh, struct upc_req, rq_chain);
-                        lh = lh->next;
                        if ( req->rq_flags & REQ_ASYNC ) {
                                list_del(&(req->rq_chain));
                                CDEBUG(D_UPCALL, "free pending upcall type %d\n",
@@ -448,8 +442,7 @@ void presto_psdev_cleanup(void)
                                wake_up(&req->rq_sleep);
                        }
                }
-                lh = &channel->uc_processing;
+		list_for_each(lh, &channel->uc_processing) {
-                while ( (lh = lh->next) != &channel->uc_processing ) {
                        struct upc_req *req;
                        req = list_entry(lh, struct upc_req, rq_chain);
                        list_del(&(req->rq_chain));
@@ -562,6 +555,10 @@ int izo_upc_upcall(int minor, int *size, struct izo_upcall_hdr *buffer,
        buffer->u_uniq = req->rq_unique;
        buffer->u_async = async;
+        /* Remove potential datarace possibility*/
+        if ( async ) 
+                req->rq_flags = REQ_ASYNC;
        spin_lock(&channel->uc_lock); 
        /* Append msg to pending queue and poke Lento. */
        list_add(&req->rq_chain, channel->uc_pending.prev);
@@ -574,7 +571,7 @@ int izo_upc_upcall(int minor, int *size, struct izo_upcall_hdr *buffer,
        if ( async ) {
                /* req, rq_data are freed in presto_psdev_read for async */
-                req->rq_flags = REQ_ASYNC;
+                /* req->rq_flags = REQ_ASYNC;*/
                EXIT;
                return 0;
        }
@@ -645,5 +642,6 @@ int izo_upc_upcall(int minor, int *size, struct izo_upcall_hdr *buffer,
 exit_req:
        PRESTO_FREE(req, sizeof(struct upc_req));
 exit_buf:
+        PRESTO_FREE(buffer,*size);
        return error;
 }
--- a/fs/intermezzo/replicator.c
+++ b/fs/intermezzo/replicator.c
@@ -97,11 +97,10 @@ izo_rep_cache_clean(struct presto_file_set *fset)
 struct izo_offset_rec *
 izo_rep_cache_find(struct presto_file_set *fset, char *uuid)
 {
-	struct list_head *buck = izo_rep_hash(fset->fset_clients, uuid);
+	struct list_head *tmp, *buck = izo_rep_hash(fset->fset_clients, uuid);
-	struct list_head *tmp = buck;
        struct izo_offset_rec *rec = NULL;
-        while ( (tmp = tmp->next) != buck ) {
+	list_for_each(tmp, buck) {
 		rec = list_entry(tmp, struct izo_offset_rec, or_list);
                if ( memcmp(rec->or_uuid, uuid, sizeof(rec->or_uuid)) == 0 )
 			return rec;

--- a/fs/intermezzo/super.c
+++ b/fs/intermezzo/super.c
@@ -38,7 +38,6 @@ static char rcsid[] __attribute ((unused)) = "$Id: super.c,v 1.4 2002/10/12 02:1
 #include <linux/sched.h>
 #include <linux/stat.h>
 #include <linux/string.h>
-#include <linux/smp_lock.h>
 #include <linux/blkdev.h>
 #include <linux/init.h>
 #include <linux/devfs_fs_kernel.h>

--- a/fs/intermezzo/upcall.c
+++ b/fs/intermezzo/upcall.c
@@ -39,7 +39,6 @@
 #include <linux/fs.h>
 #include <linux/stat.h>
 #include <linux/errno.h>
-#include <linux/smp_lock.h>
 #include <linux/string.h>
 #include <asm/uaccess.h>

--- a/fs/intermezzo/vfs.c
+++ b/fs/intermezzo/vfs.c
@@ -55,7 +55,6 @@
 #include <linux/mm.h>
 #include <linux/proc_fs.h>
-#include <linux/smp_lock.h>
 #include <linux/quotaops.h>
 #include <asm/uaccess.h>