diff options
| author | Miguel de Icaza <miguel@nuclecu.unam.mx> | 1997-08-06 19:14:48 +0000 |
|---|---|---|
| committer | Miguel de Icaza <miguel@nuclecu.unam.mx> | 1997-08-06 19:14:48 +0000 |
| commit | e2819e52a162873ff5061de81bb749831bdb5de9 (patch) | |
| tree | 6067ea700202750ba335a423696f2972700e5f76 /fs/ufs | |
| parent | 17a005074429bbf143e40401f405ae4363e56828 (diff) | |
Merge to 2.1.38.
IMPORTANT NOTE: I could not figure out what information is the
one that should be used for the following files (ie, those
that were in our tree, or those that came from Linus' patch),
please, check these:
include/asm-mips/jazz.h
include/asm-mips/jazzdma.h
include/asm-mips/ioctls.h
Diffstat (limited to 'fs/ufs')
| -rw-r--r-- | fs/ufs/ufs_namei.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/fs/ufs/ufs_namei.c b/fs/ufs/ufs_namei.c index 64ea3a866..4ae258738 100644 --- a/fs/ufs/ufs_namei.c +++ b/fs/ufs/ufs_namei.c @@ -6,7 +6,7 @@ * Laboratory for Computer Science Research Computing Facility * Rutgers, The State University of New Jersey * - * $Id: ufs_namei.c,v 1.1.1.1 1997/06/01 03:16:19 ralf Exp $ + * $Id: ufs_namei.c,v 1.2 1997/07/20 15:00:17 ralf Exp $ * */ @@ -131,8 +131,11 @@ int ufs_lookup (struct inode * dir, struct qstr *qname, break; } if (dir->i_sb->u.ufs_sb.s_flags & UFS_DEBUG) { - printk("lfragno 0x%lx direct d 0x%x d_ino %u d_reclen %u d_namlen %u d_name `%s'\n", - lfragno, (unsigned int)d, ufs_swab32(d->d_ino), ufs_swab16(d->d_reclen), ufs_swab16(d->d_namlen), d->d_name); + printk("lfragno 0x%lx direct d 0x%x d_ino %u " + "d_reclen %u d_namlen %u d_name `%s'\n", + lfragno, (unsigned int)((unsigned long)d), + ufs_swab32(d->d_ino), ufs_swab16(d->d_reclen), + ufs_swab16(d->d_namlen), d->d_name); } if ((ufs_swab16(d->d_namlen) == len) && /* XXX - don't use strncmp() - see ext2fs */ |