From 112885a1e23996186f3cac24f57ce9db3384c161 Mon Sep 17 00:00:00 2001 From: Jens Axboe Date: Mon, 25 May 2009 09:30:45 +0200 Subject: [PATCH] --- yaml --- r: 147857 b: refs/heads/master c: 13205fb9260c2377438599ef0773c6a3eaeb0b07 h: refs/heads/master i: 147855: 3213b310505d6571e0a381f65c2f0a0f8a90f17a v: v3 --- [refs] | 2 +- trunk/fs/ntfs/super.c | 33 +++------------------------------ 2 files changed, 4 insertions(+), 31 deletions(-) diff --git a/[refs] b/[refs] index 5062206cf6da..7031431d5d6a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 28ad0c118b0ed98b042d362acfe0017591921138 +refs/heads/master: 13205fb9260c2377438599ef0773c6a3eaeb0b07 diff --git a/trunk/fs/ntfs/super.c b/trunk/fs/ntfs/super.c index a9ec4e1084e4..7a7b0d326395 100644 --- a/trunk/fs/ntfs/super.c +++ b/trunk/fs/ntfs/super.c @@ -2376,39 +2376,12 @@ static void ntfs_put_super(struct super_block *sb) vol->mftmirr_ino = NULL; } /* - * If any dirty inodes are left, throw away all mft data page cache - * pages to allow a clean umount. This should never happen any more - * due to mft.c::ntfs_mft_writepage() cleaning all the dirty pages as - * the underlying mft records are written out and cleaned. If it does, - * happen anyway, we want to know... + * We should have no dirty inodes left, due to + * mft.c::ntfs_mft_writepage() cleaning all the dirty pages as + * the underlying mft records are written out and cleaned. */ ntfs_commit_inode(vol->mft_ino); write_inode_now(vol->mft_ino, 1); - if (sb_has_dirty_inodes(sb)) { - const char *s1, *s2; - - mutex_lock(&vol->mft_ino->i_mutex); - truncate_inode_pages(vol->mft_ino->i_mapping, 0); - mutex_unlock(&vol->mft_ino->i_mutex); - write_inode_now(vol->mft_ino, 1); - if (sb_has_dirty_inodes(sb)) { - static const char *_s1 = "inodes"; - static const char *_s2 = ""; - s1 = _s1; - s2 = _s2; - } else { - static const char *_s1 = "mft pages"; - static const char *_s2 = "They have been thrown " - "away. "; - s1 = _s1; - s2 = _s2; - } - ntfs_error(sb, "Dirty %s found at umount time. %sYou should " - "run chkdsk. Please email " - "linux-ntfs-dev@lists.sourceforge.net and say " - "that you saw this message. Thank you.", s1, - s2); - } #endif /* NTFS_RW */ iput(vol->mft_ino);