The patch titled
openpromfs: factorize out
has been added to the -mm tree. Its filename is
openpromfs-factorize-out.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
From: Jan Engelhardt <jengelh@xxxxxx>
"Move" "common code" out to PTR_NOD, which does the conversion from private
pointer to node number. This is to reduce potential casting/conversion errors
due to redundancy. (The naming PTR_NOD follows PTR_ERR, turning a pointer
into xyz.)
Signed-off-by: Jan Engelhardt <jengelh@xxxxxx>
Cc: "David S. Miller" <davem@xxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
fs/openpromfs/inode.c | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff -puN fs/openpromfs/inode.c~openpromfs-factorize-out fs/openpromfs/inode.c
--- devel/fs/openpromfs/inode.c~openpromfs-factorize-out 2006-05-17 23:39:09.000000000 -0700
+++ devel-akpm/fs/openpromfs/inode.c 2006-05-17 23:39:09.000000000 -0700
@@ -64,6 +64,10 @@ 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) {
+ return (long)p & 0xFFFF;
+}
+
static ssize_t nodenum_read(struct file *file, char __user *buf,
size_t count, loff_t *ppos)
{
@@ -95,9 +99,9 @@ static ssize_t property_read(struct file
char buffer[64];
if (!filp->private_data) {
- node = nodes[(u16)((long)inode->u.generic_ip)].node;
+ node = nodes[PTR_NOD(inode->u.generic_ip)].node;
i = ((u32)(long)inode->u.generic_ip) >> 16;
- if ((u16)((long)inode->u.generic_ip) == aliases) {
+ if (PTR_NOD(inode->u.generic_ip) == aliases) {
if (i >= aliases_nodes)
p = NULL;
else
@@ -111,7 +115,7 @@ static ssize_t property_read(struct file
return -EIO;
i = prom_getproplen (node, p);
if (i < 0) {
- if ((u16)((long)inode->u.generic_ip) == aliases)
+ if (PTR_NOD(inode->u.generic_ip) == aliases)
i = 0;
else
return -EIO;
@@ -540,8 +544,8 @@ int property_release (struct inode *inod
if (!op)
return 0;
lock_kernel();
- node = nodes[(u16)((long)inode->u.generic_ip)].node;
- if ((u16)((long)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;
_
Patches currently in -mm which might be from jengelh@xxxxxx are
update-devicestxt.patch
openpromfs-fix-missing-nul.patch
openpromfs-remove-unnecessary-casts.patch
openpromfs-factorize-out.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
