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

Commit 56aa72d0 authored by Jan Kara's avatar Jan Kara Committed by Steven Whitehouse
Browse files

GFS2: Get rid of I_MUTEX_QUOTA usage 



GFS2 uses i_mutex on its system quota inode to synchronize writes to
quota file. Since this is an internal inode to GFS2 (not part of directory
hiearchy or visible by user) we are safe to define locking rules for it. So
let's just get it its own locking class to make it clear.

Signed-off-by: default avatarJan Kara <jack@suse.cz>
Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
Signed-off-by: default avatarSteven Whitehouse <swhiteho@redhat.com>
parent 0688a5ec

fs/gfs2/ops_fstype.c

+8 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include <linux/mount.h>

#include <linux/gfs2_ondisk.h>

#include <linux/quotaops.h>

#include <linux/lockdep.h>



#include "gfs2.h"

#include "incore.h"
@@ -766,6 +767,7 @@ static int init_journal(struct gfs2_sbd *sdp, int undo) 
	return error;

}



static struct lock_class_key gfs2_quota_imutex_key;



static int init_inodes(struct gfs2_sbd *sdp, int undo)

{
@@ -803,6 +805,12 @@ static int init_inodes(struct gfs2_sbd *sdp, int undo) 
		fs_err(sdp, "can't get quota file inode: %d\n", error);

		goto fail_rindex;

	}

	/*

	 * i_mutex on quota files is special. Since this inode is hidden system

	 * file, we are safe to define locking ourselves.

	 */

	lockdep_set_class(&sdp->sd_quota_inode->i_mutex,

			  &gfs2_quota_imutex_key);



	error = gfs2_rindex_update(sdp);

	if (error)

fs/gfs2/quota.c

+1 −1
Original line number Diff line number Diff line
@@ -782,7 +782,7 @@ static int do_sync(unsigned int num_qd, struct gfs2_quota_data **qda) 
		return -ENOMEM;



	sort(qda, num_qd, sizeof(struct gfs2_quota_data *), sort_qd, NULL);

	mutex_lock_nested(&ip->i_inode.i_mutex, I_MUTEX_QUOTA);

	mutex_lock(&ip->i_inode.i_mutex);

	for (qx = 0; qx < num_qd; qx++) {

		error = gfs2_glock_nq_init(qda[qx]->qd_gl, LM_ST_EXCLUSIVE,

					   GL_NOCACHE, &ghs[qx]);