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

Commit 117bf5fb authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

hpfs: Convert sbi->hpfs_creation_de to mutex 



sbi->hpfs_creation_de is used as mutex so make it a mutex.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Acked-by: default avatarChristoph Hellwig <hch@infradead.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: linux-fsdevel@vger.kernel.org
LKML-Reference: <20100907125056.228874895@linutronix.de>
parent 18cb657c

fs/hpfs/buffer.c

+2 −2
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ void hpfs_lock_creation(struct super_block *s) 
#ifdef DEBUG_LOCKS

	printk("lock creation\n");

#endif

	down(&hpfs_sb(s)->hpfs_creation_de);

	mutex_lock(&hpfs_sb(s)->hpfs_creation_de);

}



void hpfs_unlock_creation(struct super_block *s)
@@ -22,7 +22,7 @@ void hpfs_unlock_creation(struct super_block *s) 
#ifdef DEBUG_LOCKS

	printk("unlock creation\n");

#endif

	up(&hpfs_sb(s)->hpfs_creation_de);

	mutex_unlock(&hpfs_sb(s)->hpfs_creation_de);

}



/* Map a sector into a buffer and return pointers to it and to the buffer. */

fs/hpfs/hpfs_fn.h

+1 −1
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ struct hpfs_sb_info { 
	unsigned *sb_bmp_dir;		/* main bitmap directory */

	unsigned sb_c_bitmap;		/* current bitmap */

	unsigned sb_max_fwd_alloc;	/* max forwad allocation */

	struct semaphore hpfs_creation_de; /* when creating dirents, nobody else

	struct mutex hpfs_creation_de;	/* when creating dirents, nobody else

					   can alloc blocks */

	/*unsigned sb_mounting : 1;*/

	int sb_timeshift;

fs/hpfs/super.c

+1 −1
Original line number Diff line number Diff line
@@ -491,7 +491,7 @@ static int hpfs_fill_super(struct super_block *s, void *options, int silent) 
	sbi->sb_bmp_dir = NULL;

	sbi->sb_cp_table = NULL;



	init_MUTEX(&sbi->hpfs_creation_de);

	mutex_init(&sbi->hpfs_creation_de);



	uid = current_uid();

	gid = current_gid();