← Back to branch summary

~ubuntu-branches/ubuntu/precise/linux-ti-omap4/precise

« back to all changes in this revision

Viewing changes to fs/nilfs2/dir.c

  • Committer: Bazaar Package Importer
  • Author(s): Paolo Pisati
  • Date: 2011-06-29 15:23:51 UTC
  • mfrom: (26.1.1 natty-proposed)
  • Revision ID: james.westby@ubuntu.com-20110629152351-xs96tm303d95rpbk
Tags: 3.0.0-1200.2
* Rebased against 3.0.0-6.7
* BSP from TI based on 3.0.0

Show diffs side-by-side

added added

removed removed

Lines of Context:
fs/nilfs2/dir.c
440
440
        nilfs_commit_chunk(page, mapping, from, to);
441
441
        nilfs_put_page(page);
442
442
        dir->i_mtime = dir->i_ctime = CURRENT_TIME;
443
 
/*      NILFS_I(dir)->i_flags &= ~NILFS_BTREE_FL; */
444
443
}
445
444
 
446
445
/*
531
530
        nilfs_set_de_type(de, inode);
532
531
        nilfs_commit_chunk(page, page->mapping, from, to);
533
532
        dir->i_mtime = dir->i_ctime = CURRENT_TIME;
534
 
/*      NILFS_I(dir)->i_flags &= ~NILFS_BTREE_FL; */
535
533
        nilfs_mark_inode_dirty(dir);
536
534
        /* OFFSET_CACHE */
537
535
out_put:
579
577
        dir->inode = 0;
580
578
        nilfs_commit_chunk(page, mapping, from, to);
581
579
        inode->i_ctime = inode->i_mtime = CURRENT_TIME;
582
 
/*      NILFS_I(inode)->i_flags &= ~NILFS_BTREE_FL; */
583
580
out:
584
581
        nilfs_put_page(page);
585
582
        return err;
684
681
        .readdir        = nilfs_readdir,
685
682
        .unlocked_ioctl = nilfs_ioctl,
686
683
#ifdef CONFIG_COMPAT
687
 
        .compat_ioctl   = nilfs_ioctl,
 
684
        .compat_ioctl   = nilfs_compat_ioctl,
688
685
#endif  /* CONFIG_COMPAT */
689
686
        .fsync          = nilfs_sync_file,
690
687