Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso...

[muen/linux.git] / fs / ext4 / mballoc.c

diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c
index 243c42fdc155483922b60b95c69f2c79811bfd1a..6eae2b91aafa20b21fd19c61bb15fa7add625935 100644 (file)
--- a/fs/ext4/mballoc.c
+++ b/fs/ext4/mballoc.c
@@ -2254,7 +2254,7 @@ out:
 
 static void *ext4_mb_seq_groups_start(struct seq_file *seq, loff_t *pos)
 {
 
 static void *ext4_mb_seq_groups_start(struct seq_file *seq, loff_t *pos)
 {

-       struct super_block *sb = seq->private;
+       struct super_block *sb = PDE_DATA(file_inode(seq->file));

        ext4_group_t group;
 
        if (*pos < 0 || *pos >= ext4_get_groups_count(sb))
        ext4_group_t group;
 
        if (*pos < 0 || *pos >= ext4_get_groups_count(sb))


@@ -2265,7 +2265,7 @@ static void *ext4_mb_seq_groups_start(struct seq_file *seq, loff_t *pos)
 
 static void *ext4_mb_seq_groups_next(struct seq_file *seq, void *v, loff_t *pos)
 {
 
 static void *ext4_mb_seq_groups_next(struct seq_file *seq, void *v, loff_t *pos)
 {

-       struct super_block *sb = seq->private;
+       struct super_block *sb = PDE_DATA(file_inode(seq->file));

        ext4_group_t group;
 
        ++*pos;
        ext4_group_t group;
 
        ++*pos;


@@ -2277,7 +2277,7 @@ static void *ext4_mb_seq_groups_next(struct seq_file *seq, void *v, loff_t *pos)
 
 static int ext4_mb_seq_groups_show(struct seq_file *seq, void *v)
 {
 
 static int ext4_mb_seq_groups_show(struct seq_file *seq, void *v)
 {

-       struct super_block *sb = seq->private;
+       struct super_block *sb = PDE_DATA(file_inode(seq->file));

        ext4_group_t group = (ext4_group_t) ((unsigned long) v);
        int i;
        int err, buddy_loaded = 0;
        ext4_group_t group = (ext4_group_t) ((unsigned long) v);
        int i;
        int err, buddy_loaded = 0;


@@ -2330,34 +2330,13 @@ static void ext4_mb_seq_groups_stop(struct seq_file *seq, void *v)
 {
 }
 
 {
 }
 

-static const struct seq_operations ext4_mb_seq_groups_ops = {
+const struct seq_operations ext4_mb_seq_groups_ops = {

        .start  = ext4_mb_seq_groups_start,
        .next   = ext4_mb_seq_groups_next,
        .stop   = ext4_mb_seq_groups_stop,
        .show   = ext4_mb_seq_groups_show,
 };
 
        .start  = ext4_mb_seq_groups_start,
        .next   = ext4_mb_seq_groups_next,
        .stop   = ext4_mb_seq_groups_stop,
        .show   = ext4_mb_seq_groups_show,
 };
 

-static int ext4_mb_seq_groups_open(struct inode *inode, struct file *file)
-{
-       struct super_block *sb = PDE_DATA(inode);
-       int rc;
-
-       rc = seq_open(file, &ext4_mb_seq_groups_ops);
-       if (rc == 0) {
-               struct seq_file *m = file->private_data;
-               m->private = sb;
-       }
-       return rc;
-
-}
-
-const struct file_operations ext4_seq_mb_groups_fops = {
-       .open           = ext4_mb_seq_groups_open,
-       .read           = seq_read,
-       .llseek         = seq_lseek,
-       .release        = seq_release,
-};
-

 static struct kmem_cache *get_groupinfo_cache(int blocksize_bits)
 {
        int cache_index = blocksize_bits - EXT4_MIN_BLOCK_LOG_SIZE;
 static struct kmem_cache *get_groupinfo_cache(int blocksize_bits)
 {
        int cache_index = blocksize_bits - EXT4_MIN_BLOCK_LOG_SIZE;