diff options
Diffstat (limited to 'libdiskfs')
| -rw-r--r-- | libdiskfs/dir-lookup.c | 6 | ||||
| -rw-r--r-- | libdiskfs/file-set-trans.c | 7 |
2 files changed, 3 insertions, 10 deletions
diff --git a/libdiskfs/dir-lookup.c b/libdiskfs/dir-lookup.c index 9bb1d8a1..6e085e27 100644 --- a/libdiskfs/dir-lookup.c +++ b/libdiskfs/dir-lookup.c @@ -1,5 +1,5 @@ /* libdiskfs implementation of fs.defs:dir_lookup - Copyright (C) 1992, 93, 94, 95, 96, 97, 98 Free Software Foundation, Inc. + Copyright (C) 1992,93,94,95,96,97,98,99 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -25,10 +25,6 @@ #include "priv.h" #include "fs_S.h" -/* XXX - Temporary hack; this belongs in a header file, probably types.h. */ -#define major(x) ((int)(((unsigned) (x) >> 8) & 0xff)) -#define minor(x) ((int)((x) & 0xff)) - /* Implement dir_lookup as described in <hurd/fs.defs>. */ kern_return_t diskfs_S_dir_lookup (struct protid *dircred, diff --git a/libdiskfs/file-set-trans.c b/libdiskfs/file-set-trans.c index 8c1ccdfd..22f42ba9 100644 --- a/libdiskfs/file-set-trans.c +++ b/libdiskfs/file-set-trans.c @@ -1,5 +1,5 @@ /* libdiskfs implementation of fs.defs: file_set_translator - Copyright (C) 1992, 1993, 1994, 1995, 1996 Free Software Foundation, Inc. + Copyright (C) 1992, 93, 94, 95, 96, 99 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -20,9 +20,6 @@ #include <hurd/paths.h> #include <hurd/fsys.h> -/* XXX - Temporary */ -#define makedev(maj,min) ((((maj)&0xFF)<<8)+((min)&0xFF)) - /* Implement file_set_translator as described in <hurd/fs.defs>. */ kern_return_t diskfs_S_file_set_translator (struct protid *cred, @@ -159,7 +156,7 @@ diskfs_S_file_set_translator (struct protid *cred, } minor = strtol (arg, 0, 0); - error = diskfs_validate_rdev_change (np, + error = diskfs_validate_rdev_change (np, makedev (major, minor)); if (error) { |