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

Commit 3fe0fff1 authored by Kinglong Mee's avatar Kinglong Mee Committed by Jeff Layton
Browse files

locks: Rename __locks_copy_lock() to locks_copy_conflock() 



Jeff advice, " Right now __locks_copy_lock is only used to copy
conflocks. It would be good to rename that to something more
distinct (i.e.locks_copy_conflock), to make it clear that we're
generating a conflock there."

v5: change order from 3/6 to 2/6
v4: new patch only renaming function name

Signed-off-by: default avatarKinglong Mee <kinglongmee@gmail.com>
Signed-off-by: default avatarJeff Layton <jlayton@primarydata.com>
parent d0449b90

fs/locks.c

+5 −5
Original line number Diff line number Diff line
@@ -281,7 +281,7 @@ static void locks_copy_private(struct file_lock *new, struct file_lock *fl) 
/*

 * Initialize a new lock from an existing file_lock structure.

 */

void __locks_copy_lock(struct file_lock *new, const struct file_lock *fl)

void locks_copy_conflock(struct file_lock *new, struct file_lock *fl)

{

	new->fl_owner = fl->fl_owner;

	new->fl_pid = fl->fl_pid;
@@ -293,14 +293,14 @@ void __locks_copy_lock(struct file_lock *new, const struct file_lock *fl) 
	new->fl_ops = NULL;

	new->fl_lmops = NULL;

}

EXPORT_SYMBOL(__locks_copy_lock);

EXPORT_SYMBOL(locks_copy_conflock);



void locks_copy_lock(struct file_lock *new, struct file_lock *fl)

{

	/* "new" must be a freshly-initialized lock */

	WARN_ON_ONCE(new->fl_ops);



	__locks_copy_lock(new, fl);

	locks_copy_conflock(new, fl);

	new->fl_file = fl->fl_file;

	new->fl_ops = fl->fl_ops;

	new->fl_lmops = fl->fl_lmops;
@@ -735,7 +735,7 @@ posix_test_lock(struct file *filp, struct file_lock *fl) 
			break;

	}

	if (cfl) {

		__locks_copy_lock(fl, cfl);

		locks_copy_conflock(fl, cfl);

		if (cfl->fl_nspid)

			fl->fl_pid = pid_vnr(cfl->fl_nspid);

	} else
@@ -941,7 +941,7 @@ static int __posix_lock_file(struct inode *inode, struct file_lock *request, str 
			if (!posix_locks_conflict(request, fl))

				continue;

			if (conflock)

				__locks_copy_lock(conflock, fl);

				locks_copy_conflock(conflock, fl);

			error = -EAGAIN;

			if (!(request->fl_flags & FL_SLEEP))

				goto out;

include/linux/fs.h

+2 −2
Original line number Diff line number Diff line
@@ -966,7 +966,7 @@ void locks_free_lock(struct file_lock *fl); 
extern void locks_init_lock(struct file_lock *);

extern struct file_lock * locks_alloc_lock(void);

extern void locks_copy_lock(struct file_lock *, struct file_lock *);

extern void __locks_copy_lock(struct file_lock *, const struct file_lock *);

extern void locks_copy_conflock(struct file_lock *, struct file_lock *);

extern void locks_remove_posix(struct file *, fl_owner_t);

extern void locks_remove_file(struct file *);

extern void locks_release_private(struct file_lock *);
@@ -1026,7 +1026,7 @@ static inline void locks_init_lock(struct file_lock *fl) 
	return;

}



static inline void __locks_copy_lock(struct file_lock *new, struct file_lock *fl)

static inline void locks_copy_conflock(struct file_lock *new, struct file_lock *fl)

{

	return;

}