Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c3506372 authored by Christoph Hellwig's avatar Christoph Hellwig
Browse files

proc: introduce proc_create_net{,_data} 



Variants of proc_create{,_data} that directly take a struct seq_operations
and deal with network namespaces in ->open and ->release.  All callers of
proc_create + seq_open_net converted over, and seq_{open,release}_net are
removed entirely.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent a2dcdee3

drivers/net/ppp/pppoe.c

+2 −16
Original line number Diff line number Diff line
@@ -1096,21 +1096,6 @@ static const struct seq_operations pppoe_seq_ops = { 
	.stop		= pppoe_seq_stop,

	.show		= pppoe_seq_show,

};



static int pppoe_seq_open(struct inode *inode, struct file *file)

{

	return seq_open_net(inode, file, &pppoe_seq_ops,

			sizeof(struct seq_net_private));

}



static const struct file_operations pppoe_seq_fops = {

	.owner		= THIS_MODULE,

	.open		= pppoe_seq_open,

	.read		= seq_read,

	.llseek		= seq_lseek,

	.release	= seq_release_net,

};



#endif /* CONFIG_PROC_FS */



static const struct proto_ops pppoe_ops = {
@@ -1146,7 +1131,8 @@ static __net_init int pppoe_init_net(struct net *net) 


	rwlock_init(&pn->hash_lock);



	pde = proc_create("pppoe", 0444, net->proc_net, &pppoe_seq_fops);

	pde = proc_create_net("pppoe", 0444, net->proc_net,

			&pppoe_seq_ops, sizeof(struct seq_net_private));

#ifdef CONFIG_PROC_FS

	if (!pde)

		return -ENOMEM;

fs/nfs/client.c

+4 −39
Original line number Diff line number Diff line
@@ -1067,7 +1067,6 @@ void nfs_clients_init(struct net *net) 
}



#ifdef CONFIG_PROC_FS

static int nfs_server_list_open(struct inode *inode, struct file *file);

static void *nfs_server_list_start(struct seq_file *p, loff_t *pos);

static void *nfs_server_list_next(struct seq_file *p, void *v, loff_t *pos);

static void nfs_server_list_stop(struct seq_file *p, void *v);
@@ -1080,14 +1079,6 @@ static const struct seq_operations nfs_server_list_ops = { 
	.show	= nfs_server_list_show,

};



static const struct file_operations nfs_server_list_fops = {

	.open		= nfs_server_list_open,

	.read		= seq_read,

	.llseek		= seq_lseek,

	.release	= seq_release_net,

};



static int nfs_volume_list_open(struct inode *inode, struct file *file);

static void *nfs_volume_list_start(struct seq_file *p, loff_t *pos);

static void *nfs_volume_list_next(struct seq_file *p, void *v, loff_t *pos);

static void nfs_volume_list_stop(struct seq_file *p, void *v);
@@ -1100,23 +1091,6 @@ static const struct seq_operations nfs_volume_list_ops = { 
	.show	= nfs_volume_list_show,

};



static const struct file_operations nfs_volume_list_fops = {

	.open		= nfs_volume_list_open,

	.read		= seq_read,

	.llseek		= seq_lseek,

	.release	= seq_release_net,

};



/*

 * open "/proc/fs/nfsfs/servers" which provides a summary of servers with which

 * we're dealing

 */

static int nfs_server_list_open(struct inode *inode, struct file *file)

{

	return seq_open_net(inode, file, &nfs_server_list_ops,

			   sizeof(struct seq_net_private));

}



/*

 * set up the iterator to start reading from the server list and return the first item

 */
@@ -1184,15 +1158,6 @@ static int nfs_server_list_show(struct seq_file *m, void *v) 
	return 0;

}



/*

 * open "/proc/fs/nfsfs/volumes" which provides a summary of extant volumes

 */

static int nfs_volume_list_open(struct inode *inode, struct file *file)

{

	return seq_open_net(inode, file, &nfs_volume_list_ops,

			   sizeof(struct seq_net_private));

}



/*

 * set up the iterator to start reading from the volume list and return the first item

 */
@@ -1278,14 +1243,14 @@ int nfs_fs_proc_net_init(struct net *net) 
		goto error_0;



	/* a file of servers with which we're dealing */

	p = proc_create("servers", S_IFREG|S_IRUGO,

			nn->proc_nfsfs, &nfs_server_list_fops);

	p = proc_create_net("servers", S_IFREG|S_IRUGO, nn->proc_nfsfs,

			&nfs_server_list_ops, sizeof(struct seq_net_private));

	if (!p)

		goto error_1;



	/* a file of volumes that we have mounted */

	p = proc_create("volumes", S_IFREG|S_IRUGO,

			nn->proc_nfsfs, &nfs_volume_list_fops);

	p = proc_create_net("volumes", S_IFREG|S_IRUGO, nn->proc_nfsfs,

			&nfs_volume_list_ops, sizeof(struct seq_net_private));

	if (!p)

		goto error_1;

	return 0;

fs/proc/proc_net.c

+40 −21
Original line number Diff line number Diff line
@@ -38,20 +38,20 @@ static struct net *get_proc_net(const struct inode *inode) 
	return maybe_get_net(PDE_NET(PDE(inode)));

}



int seq_open_net(struct inode *ino, struct file *f,

		 const struct seq_operations *ops, int size)

static int seq_open_net(struct inode *inode, struct file *file)

{

	struct net *net;

	unsigned int state_size = PDE(inode)->state_size;

	struct seq_net_private *p;

	struct net *net;



	BUG_ON(size < sizeof(*p));

	WARN_ON_ONCE(state_size < sizeof(*p));



	net = get_proc_net(ino);

	if (net == NULL)

	net = get_proc_net(inode);

	if (!net)

		return -ENXIO;



	p = __seq_open_private(f, ops, size);

	if (p == NULL) {

	p = __seq_open_private(file, PDE(inode)->seq_ops, state_size);

	if (!p) {

		put_net(net);

		return -ENOMEM;

	}
@@ -60,7 +60,38 @@ int seq_open_net(struct inode *ino, struct file *f, 
#endif

	return 0;

}

EXPORT_SYMBOL_GPL(seq_open_net);



static int seq_release_net(struct inode *ino, struct file *f)

{

	struct seq_file *seq = f->private_data;



	put_net(seq_file_net(seq));

	seq_release_private(ino, f);

	return 0;

}



static const struct file_operations proc_net_seq_fops = {

	.open		= seq_open_net,

	.read		= seq_read,

	.llseek		= seq_lseek,

	.release	= seq_release_net,

};



struct proc_dir_entry *proc_create_net_data(const char *name, umode_t mode,

		struct proc_dir_entry *parent, const struct seq_operations *ops,

		unsigned int state_size, void *data)

{

	struct proc_dir_entry *p;



	p = proc_create_reg(name, mode, &parent, data);

	if (!p)

		return NULL;

	p->proc_fops = &proc_net_seq_fops;

	p->seq_ops = ops;

	p->state_size = state_size;

	return proc_register(parent, p);

}

EXPORT_SYMBOL_GPL(proc_create_net_data);



int single_open_net(struct inode *inode, struct file *file,

		int (*show)(struct seq_file *, void *))
@@ -86,18 +117,6 @@ int single_open_net(struct inode *inode, struct file *file, 
}

EXPORT_SYMBOL_GPL(single_open_net);



int seq_release_net(struct inode *ino, struct file *f)

{

	struct seq_file *seq;



	seq = f->private_data;



	put_net(seq_file_net(seq));

	seq_release_private(ino, f);

	return 0;

}

EXPORT_SYMBOL_GPL(seq_release_net);



int single_release_net(struct inode *ino, struct file *f)

{

	struct seq_file *seq = f->private_data;

include/linux/proc_fs.h

+9 −0
Original line number Diff line number Diff line
@@ -53,6 +53,12 @@ extern void proc_remove(struct proc_dir_entry *); 
extern void remove_proc_entry(const char *, struct proc_dir_entry *);

extern int remove_proc_subtree(const char *, struct proc_dir_entry *);



struct proc_dir_entry *proc_create_net_data(const char *name, umode_t mode,

		struct proc_dir_entry *parent, const struct seq_operations *ops,

		unsigned int state_size, void *data);

#define proc_create_net(name, mode, parent, state_size, ops) \

	proc_create_net_data(name, mode, parent, state_size, ops, NULL)



#else /* CONFIG_PROC_FS */



static inline void proc_root_init(void)
@@ -89,6 +95,9 @@ static inline void proc_remove(struct proc_dir_entry *de) {} 
#define remove_proc_entry(name, parent) do {} while (0)

static inline int remove_proc_subtree(const char *name, struct proc_dir_entry *parent) { return 0; }



#define proc_create_net_data(name, mode, parent, ops, state_size, data) ({NULL;})

#define proc_create_net(name, mode, parent, state_size, ops) ({NULL;})



#endif /* CONFIG_PROC_FS */



struct net;

include/linux/seq_file_net.h

+0 −3
Original line number Diff line number Diff line
@@ -13,11 +13,8 @@ struct seq_net_private { 
#endif

};



int seq_open_net(struct inode *, struct file *,

		 const struct seq_operations *, int);

int single_open_net(struct inode *, struct file *file,

		int (*show)(struct seq_file *, void *));

int seq_release_net(struct inode *, struct file *);

int single_release_net(struct inode *, struct file *);

static inline struct net *seq_file_net(struct seq_file *seq)

{