Commit 57b47a53 authored by Ingo Molnar's avatar Ingo Molnar Committed by David S. Miller
Browse files

[NET]: sem2mutex part 2 



Semaphore to mutex conversion.

The conversion was generated via scripts, and the result was validated
automatically via a script as well.

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6613f82d

include/linux/sunrpc/svcsock.h

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ struct svc_sock { 


	struct list_head	sk_deferred;	/* deferred requests that need to

						 * be revisted */

	struct semaphore        sk_sem;		/* to serialize sending data */

	struct mutex		sk_mutex;	/* to serialize sending data */



	int			(*sk_recvfrom)(struct svc_rqst *rqstp);

	int			(*sk_sendto)(struct svc_rqst *rqstp);

include/net/af_unix.h

+2 −1
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
#include <linux/config.h>

#include <linux/socket.h>

#include <linux/un.h>

#include <linux/mutex.h>

#include <net/sock.h>



extern void unix_inflight(struct file *fp);
@@ -71,7 +72,7 @@ struct unix_sock { 
        struct unix_address     *addr;

        struct dentry		*dentry;

        struct vfsmount		*mnt;

        struct semaphore        readsem;

	struct mutex		readlock;

        struct sock		*peer;

        struct sock		*other;

        struct sock		*gc_tree;

net/atm/common.c

+2 −2
Original line number Diff line number Diff line
@@ -451,12 +451,12 @@ int vcc_connect(struct socket *sock, int itf, short vpi, int vci) 
		dev = try_then_request_module(atm_dev_lookup(itf), "atm-device-%d", itf);

	} else {

		dev = NULL;

		down(&atm_dev_mutex);

		mutex_lock(&atm_dev_mutex);

		if (!list_empty(&atm_devs)) {

			dev = list_entry(atm_devs.next, struct atm_dev, dev_list);

			atm_dev_hold(dev);

		}

		up(&atm_dev_mutex);

		mutex_unlock(&atm_dev_mutex);

	}

	if (!dev)

		return -ENODEV;

net/atm/resources.c

+17 −15
Original line number Diff line number Diff line
@@ -18,6 +18,8 @@ 
#include <linux/bitops.h>

#include <linux/capability.h>

#include <linux/delay.h>

#include <linux/mutex.h>



#include <net/sock.h>	 /* for struct sock */



#include "common.h"
@@ -26,7 +28,7 @@ 




LIST_HEAD(atm_devs);

DECLARE_MUTEX(atm_dev_mutex);

DEFINE_MUTEX(atm_dev_mutex);



static struct atm_dev *__alloc_atm_dev(const char *type)

{
@@ -65,9 +67,9 @@ struct atm_dev *atm_dev_lookup(int number) 
{

	struct atm_dev *dev;



	down(&atm_dev_mutex);

	mutex_lock(&atm_dev_mutex);

	dev = __atm_dev_lookup(number);

	up(&atm_dev_mutex);

	mutex_unlock(&atm_dev_mutex);

	return dev;

}
@@ -83,11 +85,11 @@ struct atm_dev *atm_dev_register(const char *type, const struct atmdev_ops *ops, 
		    type);

		return NULL;

	}

	down(&atm_dev_mutex);

	mutex_lock(&atm_dev_mutex);

	if (number != -1) {

		if ((inuse = __atm_dev_lookup(number))) {

			atm_dev_put(inuse);

			up(&atm_dev_mutex);

			mutex_unlock(&atm_dev_mutex);

			kfree(dev);

			return NULL;

		}
@@ -112,12 +114,12 @@ struct atm_dev *atm_dev_register(const char *type, const struct atmdev_ops *ops, 
		printk(KERN_ERR "atm_dev_register: "

		       "atm_proc_dev_register failed for dev %s\n",

		       type);

		up(&atm_dev_mutex);

		mutex_unlock(&atm_dev_mutex);

		kfree(dev);

		return NULL;

	}

	list_add_tail(&dev->dev_list, &atm_devs);

	up(&atm_dev_mutex);

	mutex_unlock(&atm_dev_mutex);



	return dev;

}
@@ -133,9 +135,9 @@ void atm_dev_deregister(struct atm_dev *dev) 
	 * with same number can appear, such we need deregister proc, 

	 * release async all vccs and remove them from vccs list too

	 */

	down(&atm_dev_mutex);

	mutex_lock(&atm_dev_mutex);

	list_del(&dev->dev_list);

	up(&atm_dev_mutex);

	mutex_unlock(&atm_dev_mutex);



	atm_dev_release_vccs(dev);

	atm_proc_dev_deregister(dev);
@@ -196,16 +198,16 @@ int atm_dev_ioctl(unsigned int cmd, void __user *arg) 
				return -EFAULT;

			if (get_user(len, &iobuf->length))

				return -EFAULT;

			down(&atm_dev_mutex);

			mutex_lock(&atm_dev_mutex);

			list_for_each(p, &atm_devs)

				size += sizeof(int);

			if (size > len) {

				up(&atm_dev_mutex);

				mutex_unlock(&atm_dev_mutex);

				return -E2BIG;

			}

			tmp_buf = kmalloc(size, GFP_ATOMIC);

			if (!tmp_buf) {

				up(&atm_dev_mutex);

				mutex_unlock(&atm_dev_mutex);

				return -ENOMEM;

			}

			tmp_p = tmp_buf;
@@ -213,7 +215,7 @@ int atm_dev_ioctl(unsigned int cmd, void __user *arg) 
				dev = list_entry(p, struct atm_dev, dev_list);

				*tmp_p++ = dev->number;

			}

			up(&atm_dev_mutex);

			mutex_unlock(&atm_dev_mutex);

		        error = ((copy_to_user(buf, tmp_buf, size)) ||

					put_user(size, &iobuf->length))

						? -EFAULT : 0;
@@ -400,13 +402,13 @@ static __inline__ void *dev_get_idx(loff_t left) 


void *atm_dev_seq_start(struct seq_file *seq, loff_t *pos)

{

 	down(&atm_dev_mutex);

 	mutex_lock(&atm_dev_mutex);

	return *pos ? dev_get_idx(*pos) : (void *) 1;

}



void atm_dev_seq_stop(struct seq_file *seq, void *v)

{

 	up(&atm_dev_mutex);

 	mutex_unlock(&atm_dev_mutex);

}

 

void *atm_dev_seq_next(struct seq_file *seq, void *v, loff_t *pos)

net/atm/resources.h

+2 −1
Original line number Diff line number Diff line
@@ -8,10 +8,11 @@ 


#include <linux/config.h>

#include <linux/atmdev.h>

#include <linux/mutex.h>





extern struct list_head atm_devs;

extern struct semaphore atm_dev_mutex;

extern struct mutex atm_dev_mutex;



int atm_dev_ioctl(unsigned int cmd, void __user *arg);

CRA Git | Maintained and supported by SUSTech CRA and CCSE