patch-2.2.15 linux/fs/isofs/inode.c

• Lines: 33
• Date: Fri Apr 21 12:46:43 2000
• Orig file: v2.2.14/fs/isofs/inode.c
• Orig date: Tue Jan 4 21:19:00 2000

diff -u --new-file --recursive --exclude-from ../../exclude v2.2.14/fs/isofs/inode.c linux/fs/isofs/inode.c
@@ -958,16 +958,20 @@
 }
 
 
-static void test_and_set_uid(uid_t *p, uid_t value)
+static inline void test_and_set_uid(uid_t *p, uid_t value)
 {
 	if(value) {
 		*p = value;
-#if 0
-		printk("Resetting to %d\n", value);
-#endif
 	}
 }
 
+static inline void test_and_set_gid(gid_t *p, gid_t value)
+{
+        if(value) {
+                *p = value;
+        }
+}
+
 static int isofs_read_level3_size(struct inode * inode)
 {
 	unsigned long ino = inode->i_ino;
@@ -1171,6 +1175,7 @@
 	  parse_rock_ridge_inode(raw_inode, inode);
 	  /* hmm..if we want uid or gid set, override the rock ridge setting */
 	 test_and_set_uid(&inode->i_uid, inode->i_sb->u.isofs_sb.s_uid);
+         test_and_set_gid(&inode->i_gid, inode->i_sb->u.isofs_sb.s_gid);
 	}
 
 #ifdef DEBUG