-Index: linux-2.6.18-53.1.21/include/linux/ext3_fs.h
+Index: linux-2.6.22.19/include/linux/ext3_fs.h
===================================================================
---- linux-2.6.18-53.1.21.orig/include/linux/ext3_fs.h
-+++ linux-2.6.18-53.1.21/include/linux/ext3_fs.h
-@@ -53,6 +53,31 @@
+--- linux-2.6.22.19.orig/include/linux/ext3_fs.h
++++ linux-2.6.22.19/include/linux/ext3_fs.h
+@@ -54,6 +54,31 @@
#define ext3_debug(f, a...) do {} while (0)
#endif
/*
* Special inodes numbers
*/
-@@ -398,6 +423,14 @@ struct ext3_inode {
+@@ -412,6 +437,14 @@ struct ext3_inode {
#define ext3_find_first_zero_bit ext2_find_first_zero_bit
#define ext3_find_next_zero_bit ext2_find_next_zero_bit
/*
* Maximal mount counts between two filesystem checks
*/
-@@ -799,6 +832,20 @@ extern unsigned long ext3_count_dirs (st
+@@ -813,6 +846,20 @@ extern unsigned long ext3_count_dirs (st
extern void ext3_check_inodes_bitmap (struct super_block *);
extern unsigned long ext3_count_free (struct buffer_head *, unsigned);
/* inode.c */
int ext3_forget(handle_t *handle, int is_metadata, struct inode *inode,
-@@ -843,6 +890,10 @@ extern int ext3_group_extend(struct supe
+@@ -859,6 +906,10 @@ extern int ext3_group_extend(struct supe
ext3_fsblk_t n_blocks_count);
/* super.c */
extern void ext3_error (struct super_block *, const char *, const char *, ...)
__attribute__ ((format (printf, 3, 4)));
extern void __ext3_std_error (struct super_block *, const char *, int);
-Index: linux-2.6.18-53.1.21/include/linux/ext3_fs_sb.h
+Index: linux-2.6.22.19/include/linux/ext3_fs_sb.h
===================================================================
---- linux-2.6.18-53.1.21.orig/include/linux/ext3_fs_sb.h
-+++ linux-2.6.18-53.1.21/include/linux/ext3_fs_sb.h
+--- linux-2.6.22.19.orig/include/linux/ext3_fs_sb.h
++++ linux-2.6.22.19/include/linux/ext3_fs_sb.h
@@ -88,6 +88,68 @@ struct ext3_sb_info {
unsigned long s_ext_blocks;
unsigned long s_ext_extents;
+ [(group) & (EXT3_DESC_PER_BLOCK(sb) - 1)]
+
#endif /* _LINUX_EXT3_FS_SB */
-Index: linux-2.6.18-53.1.21/fs/ext3/super.c
+Index: linux-2.6.22.19/fs/ext3/super.c
===================================================================
---- linux-2.6.18-53.1.21.orig/fs/ext3/super.c
-+++ linux-2.6.18-53.1.21/fs/ext3/super.c
-@@ -391,6 +391,7 @@ static void ext3_put_super (struct super
+--- linux-2.6.22.19.orig/fs/ext3/super.c
++++ linux-2.6.22.19/fs/ext3/super.c
+@@ -392,6 +392,7 @@ static void ext3_put_super (struct super
struct ext3_super_block *es = sbi->s_es;
int i;
ext3_ext_release(sb);
ext3_xattr_put_super(sb);
journal_destroy(sbi->s_journal);
-@@ -433,6 +434,8 @@ static void ext3_put_super (struct super
- invalidate_bdev(sbi->journal_bdev, 0);
+@@ -434,6 +435,10 @@ static void ext3_put_super (struct super
+ invalidate_bdev(sbi->journal_bdev);
ext3_blkdev_remove(sbi);
}
-+ remove_proc_entry(sb->s_id, proc_root_ext3);
-+ sbi->s_dev_proc = NULL;
++ if (sbi->s_dev_proc) {
++ remove_proc_entry(sbi->s_dev_proc->name, proc_root_ext3);
++ sbi->s_dev_proc = NULL;
++ }
sb->s_fs_info = NULL;
kfree(sbi);
return;
-@@ -458,6 +461,8 @@ static struct inode *ext3_alloc_inode(st
+@@ -459,6 +464,8 @@ static struct inode *ext3_alloc_inode(st
ei->vfs_inode.i_version = 1;
memset(&ei->i_cached_extent, 0, sizeof(ei->i_cached_extent));
return &ei->vfs_inode;
}
-@@ -1454,6 +1459,13 @@ static int ext3_fill_super (struct super
+@@ -1434,6 +1441,7 @@ static int ext3_fill_super (struct super
+ unsigned long journal_devnum = 0;
+ unsigned long def_mount_opts;
+ struct inode *root;
++ char *devname;
+ int blocksize;
+ int hblock;
+ int db_count;
+@@ -1448,6 +1456,22 @@ static int ext3_fill_super (struct super
sbi->s_mount_opt = 0;
sbi->s_resuid = EXT3_DEF_RESUID;
sbi->s_resgid = EXT3_DEF_RESGID;
-+ sbi->s_dev_proc = proc_mkdir(sb->s_id, proc_root_ext3);
-+ if (sbi->s_dev_proc == NULL) {
-+ printk(KERN_ERR "EXT3-fs: Unable to create %s\n", sb->s_id);
-+ sb->s_fs_info = NULL;
-+ kfree(sbi);
-+ return -ENOMEM;
++ devname = kstrdup(sb->s_id, GFP_KERNEL);
++ if (devname) {
++ char *p = devname;
++ while ((p = strchr(p, '/')))
++ *p = '!';
++ sbi->s_dev_proc = proc_mkdir(devname, proc_root_ext3);
++ if (sbi->s_dev_proc == NULL)
++ printk(KERN_WARNING "EXT3-fs warning: unable to create "
++ "procfs entry for %s(%s)\n",
++ sb->s_id, devname);
++ kfree(devname);
++ } else {
++ printk(KERN_WARNING "EXT3-fs warning: cannot allocate memory "
++ "to create procfs entry for %s\n",
++ sb->s_id);
+ }
unlock_kernel();
-@@ -1857,6 +1869,8 @@ failed_mount:
+@@ -1857,6 +1881,10 @@ failed_mount:
ext3_blkdev_remove(sbi);
brelse(bh);
out_fail:
-+ remove_proc_entry(sb->s_id, proc_root_ext3);
-+ sbi->s_dev_proc = NULL;
++ if (sbi->s_dev_proc) {
++ remove_proc_entry(sbi->s_dev_proc->name, proc_root_ext3);
++ sbi->s_dev_proc = NULL;
++ }
sb->s_fs_info = NULL;
kfree(sbi);
lock_kernel();
-@@ -2782,9 +2796,46 @@ static struct file_system_type ext3_fs_t
+@@ -2787,9 +2815,46 @@ static struct file_system_type ext3_fs_t
.fs_flags = FS_REQUIRES_DEV,
};
if (err)
return err;
err = init_inodecache();
-@@ -2806,6 +2857,7 @@ static void __exit exit_ext3_fs(void)
+@@ -2811,6 +2876,7 @@ static void __exit exit_ext3_fs(void)
unregister_filesystem(&ext3_fs_type);
destroy_inodecache();
exit_ext3_xattr();
}
int ext3_map_inode_page(struct inode *inode, struct page *page,
-Index: linux-2.6.18-53.1.21/fs/ext3/mballoc.c
+Index: linux-2.6.22.19/fs/ext3/mballoc.c
===================================================================
--- /dev/null
-+++ linux-2.6.18-53.1.21/fs/ext3/mballoc.c
-@@ -0,0 +1,4475 @@
++++ linux-2.6.22.19/fs/ext3/mballoc.c
+@@ -0,0 +1,4483 @@
+/*
-+ * Copyright 2008 Sun Microsystems, Inc.
-+ * Written by Alex Tomas <alex@clusterfs.com>
++ * Copyright 2009 Sun Microsystems, Inc.
++ * Written by Alex Zhuravlev <alex.zhuravlev@sun.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ cur += 32;
+ continue;
+ }
-+ mb_clear_bit_atomic(lock, cur, bm);
++ if (lock)
++ mb_clear_bit_atomic(lock, cur, bm);
++ else
++ mb_clear_bit(cur, bm);
+ cur++;
+ }
+}
+ cur += 32;
+ continue;
+ }
-+ mb_set_bit_atomic(lock, cur, bm);
++ if (lock)
++ mb_set_bit_atomic(lock, cur, bm);
++ else
++ mb_set_bit(cur, bm);
+ cur++;
+ }
+}
+ BUG_ON(start + len > (e3b->bd_sb->s_blocksize << 3));
+ BUG_ON(e3b->bd_group != ex->fe_group);
+ BUG_ON(!ext3_is_group_locked(e3b->bd_sb, e3b->bd_group));
++ spin_lock(sb_bgl_lock(EXT3_SB(e3b->bd_sb), ex->fe_group));
+ mb_check_buddy(e3b);
+ mb_mark_used_double(e3b, start, len);
+
+ e3b->bd_info->bb_counters[ord]++;
+ }
+
-+ mb_set_bits(sb_bgl_lock(EXT3_SB(e3b->bd_sb), ex->fe_group),
-+ EXT3_MB_BITMAP(e3b), ex->fe_start, len0);
++ mb_set_bits(NULL, EXT3_MB_BITMAP(e3b), ex->fe_start, len0);
+ mb_check_buddy(e3b);
++ spin_unlock(sb_bgl_lock(EXT3_SB(e3b->bd_sb), ex->fe_group));
+
+ return ret;
+}
+ ext3_error(sb, __FUNCTION__,
+ "Allocating block in system zone - block = %lu",
+ (unsigned long) block);
++ ext3_lock_group(sb, ac->ac_b_ex.fe_group);
++ spin_lock(sb_bgl_lock(sbi, ac->ac_b_ex.fe_group));
+#ifdef AGGRESSIVE_CHECK
+ {
+ int i;
+ }
+ }
+#endif
-+ mb_set_bits(sb_bgl_lock(sbi, ac->ac_b_ex.fe_group), bitmap_bh->b_data,
++ mb_set_bits(NULL, bitmap_bh->b_data,
+ ac->ac_b_ex.fe_start, ac->ac_b_ex.fe_len);
+
-+ spin_lock(sb_bgl_lock(sbi, ac->ac_b_ex.fe_group));
+ gdp->bg_free_blocks_count =
+ cpu_to_le16(le16_to_cpu(gdp->bg_free_blocks_count)
+ - ac->ac_b_ex.fe_len);
+ spin_unlock(sb_bgl_lock(sbi, ac->ac_b_ex.fe_group));
+ percpu_counter_mod(&sbi->s_freeblocks_counter, - ac->ac_b_ex.fe_len);
++ ext3_unlock_group(sb, ac->ac_b_ex.fe_group);
+
+ err = ext3_journal_dirty_metadata(handle, bitmap_bh);
+ if (err)
+ unsigned short max = EXT3_BLOCKS_PER_GROUP(sb);
+ unsigned short i, first, free = 0;
+
++ spin_lock(sb_bgl_lock(EXT3_SB(sb), group));
+ i = mb_find_next_zero_bit(bitmap, max, 0);
+
+ while (i < max) {
+ }
+
+ if (free != le16_to_cpu(gdp->bg_free_blocks_count)) {
++ spin_unlock(sb_bgl_lock(EXT3_SB(sb), group));
+ ext3_error(sb, __FUNCTION__, "on-disk bitmap for group %d"
+ "corrupted: %u blocks free in bitmap, %u - in gd\n",
+ group, free, le16_to_cpu(gdp->bg_free_blocks_count));
+ return -EIO;
+ }
++ spin_unlock(sb_bgl_lock(EXT3_SB(sb), group));
+ return 0;
+}
+
+ BUG_ON(e3b->bd_bitmap_page == NULL);
+ BUG_ON(e3b->bd_buddy_page == NULL);
+
-+ ext3_lock_group(sb, group);
+ for (i = 0; i < count; i++) {
+ md = db->bb_md_cur;
+ if (md && db->bb_tid != handle->h_transaction->t_tid) {
+ db->bb_md_cur = NULL;
+ }
+ }
-+ ext3_unlock_group(sb, group);
+ return 0;
+}
+
+ if (err)
+ goto error_return;
+
++ ext3_lock_group(sb, block_group);
++ spin_lock(sb_bgl_lock(sbi, block_group));
+#ifdef AGGRESSIVE_CHECK
+ {
+ int i;
+ BUG_ON(!mb_test_bit(bit + i, bitmap_bh->b_data));
+ }
+#endif
-+ mb_clear_bits(sb_bgl_lock(sbi, block_group), bitmap_bh->b_data, bit,
-+ count);
-+
-+ /* We dirtied the bitmap block */
-+ BUFFER_TRACE(bitmap_bh, "dirtied bitmap block");
-+ err = ext3_journal_dirty_metadata(handle, bitmap_bh);
-+
-+ ac.ac_b_ex.fe_group = block_group;
-+ ac.ac_b_ex.fe_start = bit;
-+ ac.ac_b_ex.fe_len = count;
-+ ext3_mb_store_history(&ac);
++ mb_clear_bits(NULL, bitmap_bh->b_data, bit, count);
++ gdp->bg_free_blocks_count =
++ cpu_to_le16(le16_to_cpu(gdp->bg_free_blocks_count) + count);
++ spin_unlock(sb_bgl_lock(sbi, block_group));
++ percpu_counter_mod(&sbi->s_freeblocks_counter, count);
+
+ if (metadata) {
+ /* blocks being freed are metadata. these blocks shouldn't
+ * be used until this transaction is committed */
+ ext3_mb_free_metadata(handle, &e3b, block_group, bit, count);
+ } else {
-+ ext3_lock_group(sb, block_group);
+ err = mb_free_blocks(inode, &e3b, bit, count);
+ ext3_mb_return_to_preallocation(inode, &e3b, block, count);
-+ ext3_unlock_group(sb, block_group);
+ BUG_ON(err != 0);
+ }
++ ext3_unlock_group(sb, block_group);
+
-+ spin_lock(sb_bgl_lock(sbi, block_group));
-+ gdp->bg_free_blocks_count =
-+ cpu_to_le16(le16_to_cpu(gdp->bg_free_blocks_count) + count);
-+ spin_unlock(sb_bgl_lock(sbi, block_group));
-+ percpu_counter_mod(&sbi->s_freeblocks_counter, count);
++ ac.ac_b_ex.fe_group = block_group;
++ ac.ac_b_ex.fe_start = bit;
++ ac.ac_b_ex.fe_len = count;
++ ext3_mb_store_history(&ac);
++
++ /* We dirtied the bitmap block */
++ BUFFER_TRACE(bitmap_bh, "dirtied bitmap block");
++ err = ext3_journal_dirty_metadata(handle, bitmap_bh);
+
+ ext3_mb_release_desc(&e3b);
+
git://git.whamcloud.com / fs / lustre-release.git / blobdiff