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

Commit 90415dea authored by Jeff Mahoney's avatar Jeff Mahoney Committed by Linus Torvalds
Browse files

reiserfs: convert j_commit_lock to mutex 



j_commit_lock is a semaphore but uses it as if it were a mutex.  This patch
converts it to a mutex.

[akpm@linux-foundation.org: coding-style fixes]
Signed-off-by: default avatarJeff Mahoney <jeffm@suse.com>
Cc: Matthew Wilcox <matthew@wil.cx>
Cc: Chris Mason <chris.mason@oracle.com>
Cc: Edward Shishkin <edward.shishkin@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent afe70259

fs/reiserfs/journal.c

+10 −12
Original line number Diff line number Diff line
@@ -34,15 +34,10 @@ 
**		        from within kupdate, it will ignore the immediate flag

*/



#include <asm/uaccess.h>

#include <asm/system.h>



#include <linux/time.h>

#include <linux/semaphore.h>



#include <linux/vmalloc.h>

#include <linux/reiserfs_fs.h>



#include <linux/kernel.h>

#include <linux/errno.h>

#include <linux/fcntl.h>
@@ -54,6 +49,9 @@ 
#include <linux/writeback.h>

#include <linux/blkdev.h>

#include <linux/backing-dev.h>

#include <linux/uaccess.h>



#include <asm/system.h>



/* gets a struct reiserfs_journal_list * from a list head */

#define JOURNAL_LIST_ENTRY(h) (list_entry((h), struct reiserfs_journal_list, \
@@ -1045,9 +1043,9 @@ static int flush_commit_list(struct super_block *s, 
	}



	/* make sure nobody is trying to flush this one at the same time */

	down(&jl->j_commit_lock);

	mutex_lock(&jl->j_commit_mutex);

	if (!journal_list_still_alive(s, trans_id)) {

		up(&jl->j_commit_lock);

		mutex_unlock(&jl->j_commit_mutex);

		goto put_jl;

	}

	BUG_ON(jl->j_trans_id == 0);
@@ -1057,7 +1055,7 @@ static int flush_commit_list(struct super_block *s, 
		if (flushall) {

			atomic_set(&(jl->j_older_commits_done), 1);

		}

		up(&jl->j_commit_lock);

		mutex_unlock(&jl->j_commit_mutex);

		goto put_jl;

	}
@@ -1181,7 +1179,7 @@ static int flush_commit_list(struct super_block *s, 
	if (flushall) {

		atomic_set(&(jl->j_older_commits_done), 1);

	}

	up(&jl->j_commit_lock);

	mutex_unlock(&jl->j_commit_mutex);

      put_jl:

	put_journal_list(s, jl);
@@ -2556,7 +2554,7 @@ static struct reiserfs_journal_list *alloc_journal_list(struct super_block *s) 
	INIT_LIST_HEAD(&jl->j_working_list);

	INIT_LIST_HEAD(&jl->j_tail_bh_list);

	INIT_LIST_HEAD(&jl->j_bh_list);

	sema_init(&jl->j_commit_lock, 1);

	mutex_init(&jl->j_commit_mutex);

	SB_JOURNAL(s)->j_num_lists++;

	get_journal_list(jl);

	return jl;
@@ -4030,7 +4028,7 @@ static int do_journal_end(struct reiserfs_transaction_handle *th, 
	 * the new transaction is fully setup, and we've already flushed the

	 * ordered bh list

	 */

	down(&jl->j_commit_lock);

	mutex_lock(&jl->j_commit_mutex);



	/* save the transaction id in case we need to commit it later */

	commit_trans_id = jl->j_trans_id;
@@ -4196,7 +4194,7 @@ static int do_journal_end(struct reiserfs_transaction_handle *th, 
		lock_kernel();

	}

	BUG_ON(!list_empty(&jl->j_tail_bh_list));

	up(&jl->j_commit_lock);

	mutex_unlock(&jl->j_commit_mutex);



	/* honor the flush wishes from the caller, simple commits can

	 ** be done outside the journal lock, they are done below

include/linux/reiserfs_fs_sb.h

+1 −1
Original line number Diff line number Diff line
@@ -152,7 +152,7 @@ struct reiserfs_journal_list { 
	atomic_t j_nonzerolen;

	atomic_t j_commit_left;

	atomic_t j_older_commits_done;	/* all commits older than this on disk */

	struct semaphore j_commit_lock;

	struct mutex j_commit_mutex;

	unsigned long j_trans_id;

	time_t j_timestamp;

	struct reiserfs_list_bitmap *j_list_bitmap;