diff options
| author | Linus Torvalds <torvalds@home.transmeta.com> | 2002-07-04 08:54:40 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.transmeta.com> | 2002-07-04 08:54:40 -0700 |
| commit | 75eead62e1de867de280c4edfc24e86cc50577cb (patch) | |
| tree | 59990c678e78f2928badd292062a1632851a4f4d /fs/locks.c | |
| parent | 78f1f626d9412e572e9e18a06c9989deaede8a9a (diff) | |
| parent | 88cc0d3e8fc80880372e6900712a6f3f8172286a (diff) | |
Merge home.transmeta.com:/home/torvalds/v2.5/viro
into home.transmeta.com:/home/torvalds/v2.5/linux
Diffstat (limited to 'fs/locks.c')
| -rw-r--r-- | fs/locks.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/fs/locks.c b/fs/locks.c index 1e58f91263c5..bb32d1516343 100644 --- a/fs/locks.c +++ b/fs/locks.c @@ -1751,9 +1751,12 @@ static void lock_get_status(char* out, struct file_lock *fl, int id, char *pfx) ? (fl->fl_type & F_UNLCK) ? "UNLCK" : "READ " : (fl->fl_type & F_WRLCK) ? "WRITE" : "READ "); } + /* + * NOTE: it should be inode->i_sb->s_id, not kdevname(...). + */ out += sprintf(out, "%d %s:%ld ", fl->fl_pid, - inode ? kdevname(inode->i_dev) : "<none>", + inode ? kdevname(to_kdev_t(inode->i_dev)) : "<none>", inode ? inode->i_ino : 0); out += sprintf(out, "%Ld ", fl->fl_start); if (fl->fl_end == OFFSET_MAX) |