path: root/fs
diff options
authorLinus Torvalds <torvalds@linux-foundation.org>2019-12-29 09:50:57 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2019-12-29 09:50:57 -0800
commitd75663868d60f74bda33135fd737a7967532c357 (patch)
treedeadb7223b57f0f3b6161df2e59a9e41378dadb1 /fs
parentcc2f36ec7188e48c2afb1428fc3ce18884ad634b (diff)
parent98ca480a8f22fdbd768e3dad07024c8d4856576c (diff)
Merge tag 'locks-v5.5-1' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/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
Diffstat (limited to 'fs')
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/locks.c b/fs/locks.c
index 6970f55daf54..44b6da032842 100644
--- a/fs/locks.c
+++ b/fs/locks.c
@@ -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,
MINOR(inode->i_sb->s_dev), inode->i_ino);
} else {

Privacy Policy