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

Commit 490c560b authored by Jens Axboe's avatar Jens Axboe
Browse files

Merge branch 'for-jens' of git://git.drbd.org/linux-2.6-drbd into for-linus

parents 9504e086 820cd61a

drivers/block/drbd/drbd_int.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -1490,7 +1490,7 @@ void drbd_bump_write_ordering(struct drbd_conf *mdev, enum write_ordering_e wo); 




/* drbd_proc.c */

/* drbd_proc.c */

extern struct proc_dir_entry *drbd_proc;

extern struct proc_dir_entry *drbd_proc;

extern struct file_operations drbd_proc_fops;

extern const struct file_operations drbd_proc_fops;

extern const char *drbd_conn_str(enum drbd_conns s);

extern const char *drbd_conn_str(enum drbd_conns s);

extern const char *drbd_role_str(enum drbd_role s);

extern const char *drbd_role_str(enum drbd_role s);

drivers/block/drbd/drbd_main.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -27,7 +27,6 @@ 
 */

 */





#include <linux/module.h>

#include <linux/module.h>

#include <linux/version.h>

#include <linux/drbd.h>

#include <linux/drbd.h>

#include <asm/uaccess.h>

#include <asm/uaccess.h>

#include <asm/types.h>

#include <asm/types.h>
@@ -151,7 +150,7 @@ wait_queue_head_t drbd_pp_wait; 




DEFINE_RATELIMIT_STATE(drbd_ratelimit_state, 5 * HZ, 5);

DEFINE_RATELIMIT_STATE(drbd_ratelimit_state, 5 * HZ, 5);





static struct block_device_operations drbd_ops = {

static const struct block_device_operations drbd_ops = {

	.owner =   THIS_MODULE,

	.owner =   THIS_MODULE,

	.open =    drbd_open,

	.open =    drbd_open,

	.release = drbd_release,

	.release = drbd_release,

drivers/block/drbd/drbd_proc.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -38,7 +38,7 @@ static int drbd_proc_open(struct inode *inode, struct file *file); 








struct proc_dir_entry *drbd_proc;

struct proc_dir_entry *drbd_proc;

struct file_operations drbd_proc_fops = {

const struct file_operations drbd_proc_fops = {

	.owner		= THIS_MODULE,

	.owner		= THIS_MODULE,

	.open		= drbd_proc_open,

	.open		= drbd_proc_open,

	.read		= seq_read,

	.read		= seq_read,

drivers/block/drbd/drbd_receiver.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -28,7 +28,6 @@ 
#include <asm/uaccess.h>

#include <asm/uaccess.h>

#include <net/sock.h>

#include <net/sock.h>





#include <linux/version.h>

#include <linux/drbd.h>

#include <linux/drbd.h>

#include <linux/fs.h>

#include <linux/fs.h>

#include <linux/file.h>

#include <linux/file.h>

drivers/block/drbd/drbd_worker.c

+0 −2
Original line number Original line Diff line number Diff line
@@ -24,7 +24,6 @@ 
 */

 */





#include <linux/module.h>

#include <linux/module.h>

#include <linux/version.h>

#include <linux/drbd.h>

#include <linux/drbd.h>

#include <linux/sched.h>

#include <linux/sched.h>

#include <linux/smp_lock.h>

#include <linux/smp_lock.h>
@@ -34,7 +33,6 @@ 
#include <linux/mm_inline.h>

#include <linux/mm_inline.h>

#include <linux/slab.h>

#include <linux/slab.h>

#include <linux/random.h>

#include <linux/random.h>

#include <linux/mm.h>

#include <linux/string.h>

#include <linux/string.h>

#include <linux/scatterlist.h>

#include <linux/scatterlist.h>