← Back to branch summary

~ubuntu-branches/ubuntu/raring/linux-ti-omap4/raring-proposed

« back to all changes in this revision

Viewing changes to fs/nilfs2/ioctl.c

  • Committer: Package Import Robot
  • Author(s): Paolo Pisati, Paolo Pisati, Ubuntu: 3.5.0-26.42
  • Date: 2013-03-14 15:21:40 UTC
  • mfrom: (76.1.1 quantal-proposed)
  • Revision ID: package-import@ubuntu.com-20130314152140-tl4mkjmxa038tm3h
Tags: 3.5.0-221.31
https://launchpad.net/bugs/1153648
https://launchpad.net/bugs/1152715
https://launchpad.net/bugs/1122094
https://launchpad.net/bugs/1147678
* Release Tracking Bug
  - LP: #1153648

[ Paolo Pisati ]

* rebased on Ubuntu-3.5.0-26.42

[ Ubuntu: 3.5.0-26.42 ]

* Release Tracking Bug
  - LP: #1152715
* ubuntu: overlayfs -- fix missmerge of vfs_open changes
  - LP: #1122094, #1147678

Show diffs side-by-side

added added

removed removed

Lines of Context:
fs/nilfs2/ioctl.c
666
666
        if (ret < 0)
667
667
                printk(KERN_ERR "NILFS: GC failed during preparation: "
668
668
                        "cannot read source blocks: err=%d\n", ret);
669
 
        else
 
669
        else {
 
670
                if (nilfs_sb_need_update(nilfs))
 
671
                        set_nilfs_discontinued(nilfs);
670
672
                ret = nilfs_clean_segments(inode->i_sb, argv, kbufs);
 
673
        }
671
674
 
672
675
        nilfs_remove_all_gcinodes(nilfs);
673
676
        clear_nilfs_gc_running(nilfs);