From: Andrew Morton Cc: Jan Engelhardt Cc: "David S. Miller" Signed-off-by: Andrew Morton --- fs/openpromfs/inode.c | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff -puN fs/openpromfs/inode.c~openpromfs-factorize-out-tidy fs/openpromfs/inode.c --- devel/fs/openpromfs/inode.c~openpromfs-factorize-out-tidy 2006-05-17 23:41:42.000000000 -0700 +++ devel-akpm/fs/openpromfs/inode.c 2006-05-17 23:41:42.000000000 -0700 @@ -64,7 +64,8 @@ static int openpromfs_readdir(struct fil static struct dentry *openpromfs_lookup(struct inode *, struct dentry *dentry, struct nameidata *nd); static int openpromfs_unlink (struct inode *, struct dentry *dentry); -static inline u16 PTR_NOD(void *p) { +static inline u16 ptr_nod(void *p) +{ return (long)p & 0xFFFF; } @@ -99,9 +100,9 @@ static ssize_t property_read(struct file char buffer[64]; if (!filp->private_data) { - node = nodes[PTR_NOD(inode->u.generic_ip)].node; + node = nodes[ptr_nod(inode->u.generic_ip)].node; i = ((u32)(long)inode->u.generic_ip) >> 16; - if (PTR_NOD(inode->u.generic_ip) == aliases) { + if (ptr_nod(inode->u.generic_ip) == aliases) { if (i >= aliases_nodes) p = NULL; else @@ -115,7 +116,7 @@ static ssize_t property_read(struct file return -EIO; i = prom_getproplen (node, p); if (i < 0) { - if (PTR_NOD(inode->u.generic_ip) == aliases) + if (ptr_nod(inode->u.generic_ip) == aliases) i = 0; else return -EIO; @@ -544,8 +545,8 @@ int property_release (struct inode *inod if (!op) return 0; lock_kernel(); - node = nodes[PTR_NOD(inode->u.generic_ip)].node; - if (PTR_NOD(inode->u.generic_ip) == aliases) { + node = nodes[ptr_nod(inode->u.generic_ip)].node; + if (ptr_nod(inode->u.generic_ip) == aliases) { if ((op->flag & OPP_DIRTY) && (op->flag & OPP_STRING)) { char *p = op->name; int i = (op->value - op->name) - strlen (op->name) - 1; _