diff options
| author | David S. Miller <davem@davemloft.net> | 2019-12-31 13:37:13 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-12-31 13:37:13 -0800 |
| commit | 31d518f35e1a80268a24a855be9477eb458540ad (patch) | |
| tree | 28494f630aede8f95d4ed2ebbfd14c222bd24fa6 /fs/locks.c | |
| parent | 9e860947d8d7a1504476ac49abfce90a4ce600f3 (diff) | |
| parent | 738d2902773e30939a982c8df7a7f94293659810 (diff) | |
| download | linux-stable-31d518f35e1a80268a24a855be9477eb458540ad.tar.gz linux-stable-31d518f35e1a80268a24a855be9477eb458540ad.tar.bz2 linux-stable-31d518f35e1a80268a24a855be9477eb458540ad.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Simple overlapping changes in bpf land wrt. bpf_helper_defs.h
handling.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'fs/locks.c')
| -rw-r--r-- | fs/locks.c | 2 |
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, MAJOR(inode->i_sb->s_dev), MINOR(inode->i_sb->s_dev), inode->i_ino); } else { |