Skip to contentSkip to conversation

buggy changes to fs/smbfs/inode.c

DISCUSSION David S. Miller 2 participants 3 messages Sep 26, 2003 – Sep 30, 2003

lore
Share & tools
lore
#0 lore raw

Your changes to fs/smbfs/inode.c do not build on platforms that do not define CONFIG_UID16. You cannot use low2highuid() unless CONFIG_UID16 is known to be defined.

#1 lore raw
Quoted 4 lines · David S. Miller

Your changes to fs/smbfs/inode.c do not build on platforms that do not define CONFIG_UID16. You cannot use low2highuid() unless CONFIG_UID16 is known to be defined.

Ah, sorry about that.

I guess what I want is an OLD_TO_NEW_UID macro. How does this look?

/Urban

fs/smbfs/inode.c renamed from fs/smbfs/inode.c-orig +2 -2
@@ -551,8 +551,8 @@
 	if (ver == SMB_MOUNT_OLDVERSION) {
 		mnt->version = oldmnt->version;
 
-		mnt->uid = low2highuid(oldmnt->uid);
-		mnt->gid = low2highuid(oldmnt->gid);
+		mnt->uid = OLD_TO_NEW_UID(oldmnt->uid);
+		mnt->gid = OLD_TO_NEW_GID(oldmnt->gid);
 
 		mnt->file_mode = (oldmnt->file_mode & S_IRWXUGO) | S_IFREG;
 		mnt->dir_mode = (oldmnt->dir_mode & S_IRWXUGO) | S_IFDIR;
include/linux/highuid.h renamed from include/linux/highuid.h-orig +4 -0
@@ -56,6 +56,8 @@
 #define SET_GID16(var, gid)	var = high2lowgid(gid)
 #define NEW_TO_OLD_UID(uid)	high2lowuid(uid)
 #define NEW_TO_OLD_GID(gid)	high2lowgid(gid)
+#define OLD_TO_NEW_UID(uid)	low2highuid(uid)
+#define OLD_TO_NEW_GID(gid)	low2highgid(gid)
 
 /* specific to fs/stat.c */
 #define SET_OLDSTAT_UID(stat, uid)	(stat).st_uid = high2lowuid(uid)
@@ -69,6 +71,8 @@
 #define SET_GID16(var, gid)	do { ; } while (0)
 #define NEW_TO_OLD_UID(uid)	(uid)
 #define NEW_TO_OLD_GID(gid)	(gid)
+#define OLD_TO_NEW_UID(uid)	(uid)
+#define OLD_TO_NEW_GID(gid)	(gid)
 
 #define SET_OLDSTAT_UID(stat, uid)	(stat).st_uid = (uid)
 #define SET_OLDSTAT_GID(stat, gid)	(stat).st_gid = (gid)
#2 lore raw
Quoted 1 line · On Fri, 26 Sep 2003 21:12:16 +0200 (CEST) Urban Widmark…

I guess what I want is an OLD_TO_NEW_UID macro. How does this look?

That looks great, I'll push this off to Linus.