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

Commit 004fd11d authored by Christoph Hellwig's avatar Christoph Hellwig
Browse files

drbd: switch to proc_create_single 



And stop messing with try_module_get on THIS_MODULE, which doesn't make
any sense here.

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

drivers/block/drbd/drbd_int.h

+1 −1
Original line number Diff line number Diff line
@@ -1643,7 +1643,7 @@ void drbd_bump_write_ordering(struct drbd_resource *resource, struct drbd_backin 


/* drbd_proc.c */

extern struct proc_dir_entry *drbd_proc;

extern const struct file_operations drbd_proc_fops;

int drbd_seq_show(struct seq_file *seq, void *v);



/* drbd_actlog.c */

extern bool drbd_al_begin_io_prepare(struct drbd_device *device, struct drbd_interval *i);

drivers/block/drbd/drbd_main.c

+2 −1
Original line number Diff line number Diff line
@@ -3010,7 +3010,8 @@ static int __init drbd_init(void) 
		goto fail;



	err = -ENOMEM;

	drbd_proc = proc_create_data("drbd", S_IFREG | S_IRUGO , NULL, &drbd_proc_fops, NULL);

	drbd_proc = proc_create_single("drbd", S_IFREG | S_IRUGO , NULL,

			drbd_seq_show);

	if (!drbd_proc)	{

		pr_err("unable to register proc file\n");

		goto fail;

drivers/block/drbd/drbd_proc.c

+1 −33
Original line number Diff line number Diff line
@@ -33,18 +33,7 @@ 
#include <linux/drbd.h>

#include "drbd_int.h"



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

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





struct proc_dir_entry *drbd_proc;

const struct file_operations drbd_proc_fops = {

	.owner		= THIS_MODULE,

	.open		= drbd_proc_open,

	.read		= seq_read,

	.llseek		= seq_lseek,

	.release	= drbd_proc_release,

};



static void seq_printf_with_thousands_grouping(struct seq_file *seq, long v)

{
@@ -235,7 +224,7 @@ static void drbd_syncer_progress(struct drbd_device *device, struct seq_file *se 
	}

}



static int drbd_seq_show(struct seq_file *seq, void *v)

int drbd_seq_show(struct seq_file *seq, void *v)

{

	int i, prev_i = -1;

	const char *sn;
@@ -345,24 +334,3 @@ static int drbd_seq_show(struct seq_file *seq, void *v) 


	return 0;

}
 


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

{

	int err;



	if (try_module_get(THIS_MODULE)) {

		err = single_open(file, drbd_seq_show, NULL);

		if (err)

			module_put(THIS_MODULE);

		return err;

	}

	return -ENODEV;

}



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

{

	module_put(THIS_MODULE);

	return single_release(inode, file);

}



/* PROC FS stuff end */