nilfs2: fix code indent coding style issue

[cascardo/linux.git] / fs / nilfs2 / super.c

diff --git a/fs/nilfs2/super.c b/fs/nilfs2/super.c
index 7f5d3d9..666107a 100644 (file)
--- a/fs/nilfs2/super.c
+++ b/fs/nilfs2/super.c
@@ -13,11 +13,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * Written by Ryusuke Konishi <ryusuke@osrg.net>
+ * Written by Ryusuke Konishi.
  */
 /*
  *  linux/fs/ext2/super.c
@@ -173,12 +169,10 @@ struct inode *nilfs_alloc_inode(struct super_block *sb)
 static void nilfs_i_callback(struct rcu_head *head)
 {
        struct inode *inode = container_of(head, struct inode, i_rcu);
-       struct nilfs_mdt_info *mdi = NILFS_MDT(inode);
 
-       if (mdi) {
-               kfree(mdi->mi_bgl); /* kfree(NULL) is safe */
-               kfree(mdi);
-       }
+       if (nilfs_is_metadata_file_inode(inode))
+               nilfs_mdt_destroy(inode);
+
        kmem_cache_free(nilfs_inode_cachep, NILFS_I(inode));
 }
 
@@ -279,7 +273,7 @@ struct nilfs_super_block **nilfs_prepare_super(struct super_block *sb,
                }
        } else if (sbp[1] &&
                   sbp[1]->s_magic != cpu_to_le16(NILFS_SUPER_MAGIC)) {
-                       memcpy(sbp[1], sbp[0], nilfs->ns_sbsize);
+               memcpy(sbp[1], sbp[0], nilfs->ns_sbsize);
        }
 
        if (flip && sbp[1])
@@ -749,6 +743,7 @@ static int parse_options(char *options, struct super_block *sb, int is_remount)
 
        while ((p = strsep(&options, ",")) != NULL) {
                int token;
+
                if (!*p)
                        continue;
 
@@ -891,7 +886,7 @@ int nilfs_store_magic_and_option(struct super_block *sb,
        nilfs->ns_interval = le32_to_cpu(sbp->s_c_interval);
        nilfs->ns_watermark = le32_to_cpu(sbp->s_c_block_max);
 
-       return !parse_options(data, sb, 0) ? -EINVAL : 0 ;
+       return !parse_options(data, sb, 0) ? -EINVAL : 0;
 }
 
 int nilfs_check_feature_compatibility(struct super_block *sb,
@@ -1316,7 +1311,7 @@ nilfs_mount(struct file_system_type *fs_type, int flags,
        }
 
        if (!s->s_root) {
-               s_new = true;
+               s_new = true;
 
                /* New superblock instance created */
                s->s_mode = mode;