Merge with 2.3.99-pre1.

1 files changed, 15 insertions, 15 deletions

diff --git a/fs/isofs/inode.c b/fs/isofs/inode.c
index b13ee0285..4ecd72cd2 100644
--- a/fs/isofs/inode.c
+++ b/fs/isofs/inode.c
@@ -994,16 +994,20 @@ static struct address_space_operations isofs_aops = {
 	bmap: _isofs_bmap
 };
 
-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;
@@ -1207,6 +1211,7 @@ static void isofs_read_inode(struct inode * inode)
 	  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
@@ -1431,22 +1436,17 @@ void leak_check_brelse(struct buffer_head * bh){
 
 static DECLARE_FSTYPE_DEV(iso9660_fs_type, "iso9660", isofs_read_super);
 
-int __init init_iso9660_fs(void)
+static int __init init_iso9660_fs(void)
 {
         return register_filesystem(&iso9660_fs_type);
 }
 
-#ifdef MODULE
-EXPORT_NO_SYMBOLS;
-
-int init_module(void)
+static void __exit exit_iso9660_fs(void)
 {
-	return init_iso9660_fs();
+        unregister_filesystem(&iso9660_fs_type);
 }
 
-void cleanup_module(void)
-{
-	unregister_filesystem(&iso9660_fs_type);
-}
+EXPORT_NO_SYMBOLS;
 
-#endif
+module_init(init_iso9660_fs)
+module_exit(exit_iso9660_fs)