atm: switch to proc_create_seq_private (a2d03aac) · Commits · e / devices / android_kernel_teracube_emerald

net/atm/proc.c

+13 −59

Original line number	Diff line number	Diff line
		@@ -68,7 +68,6 @@ static void atm_dev_info(struct seq_file seq, const struct atm_dev dev)
		struct vcc_state {
		int bucket;
		struct sock *sk;
		int family;
		};

		static inline int compare_family(struct sock *sk, int family)
		@@ -106,23 +105,13 @@ static int __vcc_walk(struct sock *sock, int family, int bucket, loff_t l)
		return (l < 0);
		}

		static inline void vcc_walk(struct vcc_state state, loff_t l)
		static inline void vcc_walk(struct seq_file seq, loff_t l)
		{
		return __vcc_walk(&state->sk, state->family, &state->bucket, l) ?
		state : NULL;
		}

		static int __vcc_seq_open(struct inode inode, struct file file,
		int family, const struct seq_operations *ops)
		{
		struct vcc_state *state;

		state = __seq_open_private(file, ops, sizeof(*state));
		if (state == NULL)
		return -ENOMEM;
		struct vcc_state *state = seq->private;
		int family = (uintptr_t)(PDE_DATA(file_inode(seq->file)));

		state->family = family;
		return 0;
		return __vcc_walk(&state->sk, family, &state->bucket, l) ?
		state : NULL;
		}

		static void vcc_seq_start(struct seq_file seq, loff_t *pos)
		@@ -133,7 +122,7 @@ static void vcc_seq_start(struct seq_file seq, loff_t *pos)

		read_lock(&vcc_sklist_lock);
		state->sk = SEQ_START_TOKEN;
		return left ? vcc_walk(state, left) : SEQ_START_TOKEN;
		return left ? vcc_walk(seq, left) : SEQ_START_TOKEN;
		}

		static void vcc_seq_stop(struct seq_file seq, void v)
		@@ -144,9 +133,7 @@ static void vcc_seq_stop(struct seq_file seq, void v)

		static void vcc_seq_next(struct seq_file seq, void v, loff_t pos)
		{
		struct vcc_state *state = seq->private;

		v = vcc_walk(state, 1);
		v = vcc_walk(seq, 1);
		*pos += !!PTR_ERR(v);
		return v;
		}
		@@ -280,18 +267,6 @@ static const struct seq_operations pvc_seq_ops = {
		.show = pvc_seq_show,
		};

		static int pvc_seq_open(struct inode inode, struct file file)
		{
		return __vcc_seq_open(inode, file, PF_ATMPVC, &pvc_seq_ops);
		}

		static const struct file_operations pvc_seq_fops = {
		.open = pvc_seq_open,
		.read = seq_read,
		.llseek = seq_lseek,
		.release = seq_release_private,
		};

		static int vcc_seq_show(struct seq_file seq, void v)
		{
		if (v == SEQ_START_TOKEN) {
		@@ -314,18 +289,6 @@ static const struct seq_operations vcc_seq_ops = {
		.show = vcc_seq_show,
		};

		static int vcc_seq_open(struct inode inode, struct file file)
		{
		return __vcc_seq_open(inode, file, 0, &vcc_seq_ops);
		}

		static const struct file_operations vcc_seq_fops = {
		.open = vcc_seq_open,
		.read = seq_read,
		.llseek = seq_lseek,
		.release = seq_release_private,
		};

		static int svc_seq_show(struct seq_file seq, void v)
		{
		static const char atm_svc_banner[] =
		@@ -349,18 +312,6 @@ static const struct seq_operations svc_seq_ops = {
		.show = svc_seq_show,
		};

		static int svc_seq_open(struct inode inode, struct file file)
		{
		return __vcc_seq_open(inode, file, PF_ATMSVC, &svc_seq_ops);
		}

		static const struct file_operations svc_seq_fops = {
		.open = svc_seq_open,
		.read = seq_read,
		.llseek = seq_lseek,
		.release = seq_release_private,
		};

		static ssize_t proc_dev_atm_read(struct file file, char __user buf,
		size_t count, loff_t *pos)
		{
		@@ -434,9 +385,12 @@ int __init atm_proc_init(void)
		if (!atm_proc_root)
		return -ENOMEM;
		proc_create_seq("devices", 0444, atm_proc_root, &atm_dev_seq_ops);
		proc_create("pvc", 0444, atm_proc_root, &pvc_seq_fops);
		proc_create("svc", 0444, atm_proc_root, &svc_seq_fops);
		proc_create("vc", 0444, atm_proc_root, &vcc_seq_fops);
		proc_create_seq_private("pvc", 0444, atm_proc_root, &pvc_seq_ops,
		sizeof(struct vcc_state), (void *)(uintptr_t)PF_ATMPVC);
		proc_create_seq_private("svc", 0444, atm_proc_root, &svc_seq_ops,
		sizeof(struct vcc_state), (void *)(uintptr_t)PF_ATMSVC);
		proc_create_seq_private("vc", 0444, atm_proc_root, &vcc_seq_ops,
		sizeof(struct vcc_state), NULL);
		return 0;
		}