1 files changed, 13 insertions, 4 deletions

diff --git a/fs/udf/super.c b/fs/udf/super.c
index 44fe2cb0bbb2..1d3b5d2070e5 100644
--- a/fs/udf/super.c
+++ b/fs/udf/super.c
@@ -40,7 +40,6 @@
 
 #include "udfdecl.h"    
 
-#include <linux/config.h>
 #include <linux/blkdev.h>
 #include <linux/slab.h>
 #include <linux/kernel.h>
@@ -116,6 +115,13 @@ static struct inode *udf_alloc_inode(struct super_block *sb)
         ei = (struct udf_inode_info *)kmem_cache_alloc(udf_inode_cachep, SLAB_KERNEL);
         if (!ei)
                 return NULL;
+
+        ei->i_unique = 0;
+        ei->i_lenExtents = 0;
+        ei->i_next_alloc_block = 0;
+        ei->i_next_alloc_goal = 0;
+        ei->i_strat4096 = 0;
+
         return &ei->vfs_inode;
 }
 
@@ -150,8 +156,7 @@ static int init_inodecache(void)
 
 static void destroy_inodecache(void)
 {
-        if (kmem_cache_destroy(udf_inode_cachep))
-                printk(KERN_INFO "udf_inode_cache: not all structures were freed\n");
+        kmem_cache_destroy(udf_inode_cachep);
 }
 
 /* Superblock operations */
@@ -1616,6 +1621,10 @@ static int udf_fill_super(struct super_block *sb, void *options, int silent)
                 goto error_out;
         }
 
+        if (UDF_SB_PARTFLAGS(sb, UDF_SB_PARTITION(sb)) & UDF_PART_FLAG_READ_ONLY)
+                printk("UDF-fs: Partition marked readonly; forcing readonly mount\n");
+                sb->s_flags |= MS_RDONLY;
+
         if ( udf_find_fileset(sb, &fileset, &rootdir) )
         {
                 printk("UDF-fs: No fileset found\n");
@@ -1653,7 +1662,7 @@ static int udf_fill_super(struct super_block *sb, void *options, int silent)
                 iput(inode);
                 goto error_out;
         }
-        sb->s_maxbytes = MAX_LFS_FILESIZE;
+        sb->s_maxbytes = 1<<30;
         return 0;
 
 error_out: