From 06429d67b7e9be332d1012ed4c2bba694e5ddabb Mon Sep 17 00:00:00 2001 From: Luca Weiss Date: Tue, 12 Jun 2018 12:57:06 +0200 Subject: Hurd patches (fix compilation) * isofs/rr.c (rrip_work): Use gnu_dev_makedev instead of makedev. * libdiskfs/file-set-trans.c (diskfs_S_file_set_translator): Likewise. * libnetfs/file-set-translator.c (netfs_S_file_set_translator): Likeiwse. * nfs/nfs.c (xdr_decode_fattr): Likewise. * storeio/storeio.c (parse_opt): Likewise. * libfshelp/fetch-root.c (fshelp_short_circuited_callback1): Use gnu_dev_major and gnu_dev_minor instead of major and minor. * libnetfs/file-get-translator.c (netfs_S_file_get_translator): Likewise. * nfs/ops.c (netfs_attempt_link): Likewise. * storeio/storeio.c (trivfs_append_args): Likewise. * trans/fakeroot.c (netfs_attempt_mkdev): Likewise. * pfinet/glue-include/linux/mm.h: Include . * term/users.c: Include --- nfs/nfs.c | 2 +- nfs/ops.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'nfs') diff --git a/nfs/nfs.c b/nfs/nfs.c index c4d3e157..1a8b1d42 100644 --- a/nfs/nfs.c +++ b/nfs/nfs.c @@ -466,7 +466,7 @@ xdr_decode_fattr (int *p, struct stat *st) p++; minor = ntohl (*p); p++; - st->st_rdev = makedev (major, minor); + st->st_rdev = gnu_dev_makedev (major, minor); } st->st_fsid = ntohl (*p); p++; diff --git a/nfs/ops.c b/nfs/ops.c index 03690b75..b5a80005 100644 --- a/nfs/ops.c +++ b/nfs/ops.c @@ -1037,8 +1037,8 @@ netfs_attempt_link (struct iouser *cred, struct node *dir, p = xdr_encode_sattr_stat (p, &np->nn_stat); if (np->nn->dtrans == BLKDEV || np->nn->dtrans == CHRDEV) { - *(p++) = htonl (major (np->nn_stat.st_rdev)); - *(p++) = htonl (minor (np->nn_stat.st_rdev)); + *(p++) = htonl (gnu_dev_major (np->nn_stat.st_rdev)); + *(p++) = htonl (gnu_dev_minor (np->nn_stat.st_rdev)); } pthread_mutex_unlock (&np->lock); -- cgit v1.2.3