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

Commit a03e2e4f authored by Jan Kara's avatar Jan Kara
Browse files

fsnotify: Determine lock in fsnotify_destroy_marks() 



Instead of passing spinlock into fsnotify_destroy_marks() determine it
directly in that function from the connector type. This will reduce code
churn when changing lock protecting list of marks.

Reviewed-by: default avatarMiklos Szeredi <mszeredi@redhat.com>
Reviewed-by: default avatarAmir Goldstein <amir73il@gmail.com>
Signed-off-by: default avatarJan Kara <jack@suse.cz>
parent f06fd987

fs/notify/fsnotify.h

+4 −6
Original line number Diff line number Diff line
@@ -26,19 +26,17 @@ extern struct inode *fsnotify_destroy_inode_mark(struct fsnotify_mark *mark); 
extern struct fsnotify_mark *fsnotify_find_mark(

					struct fsnotify_mark_connector *conn,

					struct fsnotify_group *group);

/* Destroy all marks connected via given connector protected by 'lock' */

extern void fsnotify_destroy_marks(struct fsnotify_mark_connector *conn,

				   spinlock_t *lock);

/* Destroy all marks connected via given connector */

extern void fsnotify_destroy_marks(struct fsnotify_mark_connector *conn);

/* run the list of all marks associated with inode and destroy them */

static inline void fsnotify_clear_marks_by_inode(struct inode *inode)

{

	fsnotify_destroy_marks(inode->i_fsnotify_marks, &inode->i_lock);

	fsnotify_destroy_marks(inode->i_fsnotify_marks);

}

/* run the list of all marks associated with vfsmount and destroy them */

static inline void fsnotify_clear_marks_by_mount(struct vfsmount *mnt)

{

	fsnotify_destroy_marks(real_mount(mnt)->mnt_fsnotify_marks,

			       &mnt->mnt_root->d_lock);

	fsnotify_destroy_marks(real_mount(mnt)->mnt_fsnotify_marks);

}

/* prepare for freeing all marks associated with given group */

extern void fsnotify_detach_group_marks(struct fsnotify_group *group);

fs/notify/mark.c

+7 −2
Original line number Diff line number Diff line
@@ -572,14 +572,19 @@ void fsnotify_detach_group_marks(struct fsnotify_group *group) 
	}

}



void fsnotify_destroy_marks(struct fsnotify_mark_connector *conn,

			    spinlock_t *lock)

void fsnotify_destroy_marks(struct fsnotify_mark_connector *conn)

{

	struct fsnotify_mark *mark;

	spinlock_t *lock;



	if (!conn)

		return;



	if (conn->flags & FSNOTIFY_OBJ_TYPE_INODE)

		lock = &conn->inode->i_lock;

	else

		lock = &conn->mnt->mnt_root->d_lock;



	while (1) {

		/*

		 * We have to be careful since we can race with e.g.