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

Commit c918d42a authored by Jeff Layton's avatar Jeff Layton
Browse files

locks: make /proc/locks show IS_FILE_PVT locks as type "FLPVT" 



In a later patch, we'll be adding a new type of lock that's owned by
the struct file instead of the files_struct. Those sorts of locks
will be flagged with a new FL_FILE_PVT flag.

Report these types of locks as "FLPVT" in /proc/locks to distinguish
them from "classic" POSIX locks.

Acked-by: default avatarJ. Bruce Fields <bfields@fieldses.org>
Signed-off-by: default avatarJeff Layton <jlayton@redhat.com>
parent 78ed8a13

fs/locks.c

+9 −2
Original line number Diff line number Diff line
@@ -135,6 +135,7 @@ 
#define IS_POSIX(fl)	(fl->fl_flags & FL_POSIX)

#define IS_FLOCK(fl)	(fl->fl_flags & FL_FLOCK)

#define IS_LEASE(fl)	(fl->fl_flags & (FL_LEASE|FL_DELEG))

#define IS_FILE_PVT(fl)	(fl->fl_flags & FL_FILE_PVT)



static bool lease_breaking(struct file_lock *fl)

{
@@ -2313,8 +2314,14 @@ static void lock_get_status(struct seq_file *f, struct file_lock *fl, 


	seq_printf(f, "%lld:%s ", id, pfx);

	if (IS_POSIX(fl)) {

		seq_printf(f, "%6s %s ",

			     (fl->fl_flags & FL_ACCESS) ? "ACCESS" : "POSIX ",

		if (fl->fl_flags & FL_ACCESS)

			seq_printf(f, "ACCESS");

		else if (IS_FILE_PVT(fl))

			seq_printf(f, "FLPVT ");

		else

			seq_printf(f, "POSIX ");



		seq_printf(f, " %s ",

			     (inode == NULL) ? "*NOINODE*" :

			     mandatory_lock(inode) ? "MANDATORY" : "ADVISORY ");

	} else if (IS_FLOCK(fl)) {

include/linux/fs.h

+1 −0
Original line number Diff line number Diff line
@@ -888,6 +888,7 @@ static inline int file_check_writeable(struct file *filp) 
#define FL_SLEEP	128	/* A blocking lock */

#define FL_DOWNGRADE_PENDING	256 /* Lease is being downgraded */

#define FL_UNLOCK_PENDING	512 /* Lease is being broken */

#define FL_FILE_PVT	1024	/* lock is private to the file */



/*

 * Special return value from posix_lock_file() and vfs_lock_file() for