[Cluster-devel] cluster/gfs-kernel/src/gfs proc.c
rpeterso at sourceware.org
rpeterso at sourceware.org
Tue Jul 18 21:18:48 UTC 2006
CVSROOT: /cvs/cluster
Module name: cluster
Changes by: rpeterso at sourceware.org 2006-07-18 21:18:48
Modified files:
gfs-kernel/src/gfs: proc.c
Log message:
Rename req_lock to gfs_req_lock to avoid duplicate symbols.
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs-kernel/src/gfs/proc.c.diff?cvsroot=cluster&r1=1.9&r2=1.10
--- cluster/gfs-kernel/src/gfs/proc.c 2006/07/18 20:48:20 1.9
+++ cluster/gfs-kernel/src/gfs/proc.c 2006/07/18 21:18:48 1.10
@@ -32,7 +32,7 @@
struct semaphore gfs_fs_lock;
char *gfs_proc_margs;
spinlock_t gfs_proc_margs_lock;
-spinlock_t req_lock;
+spinlock_t gfs_req_lock;
/**
* gfs_proc_fs_add - Add a FS to the list of mounted FSs
@@ -357,10 +357,10 @@
{
char *p;
- spin_lock(&req_lock);
+ spin_lock(&gfs_req_lock);
p = file->private_data;
file->private_data = NULL;
- spin_unlock(&req_lock);
+ spin_unlock(&gfs_req_lock);
if (p)
kfree(p);
@@ -378,9 +378,9 @@
return -EFAULT;
}
- spin_lock(&req_lock);
+ spin_lock(&gfs_req_lock);
file->private_data = p;
- spin_unlock(&req_lock);
+ spin_unlock(&gfs_req_lock);
return size;
}
@@ -401,10 +401,10 @@
char *p;
int error;
- spin_lock(&req_lock);
+ spin_lock(&gfs_req_lock);
p = file->private_data;
file->private_data = NULL;
- spin_unlock(&req_lock);
+ spin_unlock(&gfs_req_lock);
if (!p)
return -ENOENT;
@@ -472,7 +472,7 @@
init_MUTEX(&gfs_fs_lock);
gfs_proc_margs = NULL;
spin_lock_init(&gfs_proc_margs_lock);
- spin_lock_init(&req_lock);
+ spin_lock_init(&gfs_req_lock);
pde = create_proc_entry("fs/gfs", S_IFREG | 0600, NULL);
if (!pde)
More information about the Cluster-devel
mailing list