Commit d7566386 authored Dec 29, 2019 by Linus Torvalds

linux

Pull /proc/locks formatting fix from Jeff Layton:
 "This is a trivial fix for a _very_ long standing bug in /proc/locks
  formatting. Ordinarily, I'd wait for the merge window for something
  like this, but it is making it difficult to validate some overlayfs
  fixes.

  I've also gone ahead and marked this for stable"

* tag 'locks-v5.5-1' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux:
  locks: print unsigned ino in /proc/locks

parents cc2f36ec 98ca480a

fs/locks.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -2853,7 +2853,7 @@ static void lock_get_status(struct seq_file f, struct file_lock fl,
		}
		if (inode) {
		/* userspace relies on this representation of dev_t */
		seq_printf(f, "%d %02x:%02x:%ld ", fl_pid,
		seq_printf(f, "%d %02x:%02x:%lu ", fl_pid,
		MAJOR(inode->i_sb->s_dev),
		MINOR(inode->i_sb->s_dev), inode->i_ino);
		} else {

Admin message