From bed164d41604b94e77b6a82e15e917ead2afa5dc Mon Sep 17 00:00:00 2001 From: Anton Altaparmakov Date: Thu, 8 Sep 2005 16:48:28 +0100 Subject: [PATCH] --- yaml --- r: 7758 b: refs/heads/master c: 8bb735216a0675e247bbe8b8b92c09d6884d1a17 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/ntfs/ChangeLog | 1 + trunk/fs/ntfs/mft.c | 2 -- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index ab2ea0ea22fd..409aab7b19fc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 84d6ebe63f50b6efd8be252b58a207132157c60f +refs/heads/master: 8bb735216a0675e247bbe8b8b92c09d6884d1a17 diff --git a/trunk/fs/ntfs/ChangeLog b/trunk/fs/ntfs/ChangeLog index 4bc8f91c5fc0..f4c27f7c1b6a 100644 --- a/trunk/fs/ntfs/ChangeLog +++ b/trunk/fs/ntfs/ChangeLog @@ -45,6 +45,7 @@ ToDo/Notes: need to panic() if the allocation fails as it now cannot fail. - Fix two nasty runlist merging bugs that had gone unnoticed so far. Thanks to Stefano Picerno for the bug report. + - Remove two bogus BUG_ON()s from fs/ntfs/mft.c. 2.1.23 - Implement extension of resident files and make writing safe as well as many bug fixes, cleanups, and enhancements... diff --git a/trunk/fs/ntfs/mft.c b/trunk/fs/ntfs/mft.c index 317f7c679fd3..e27651db4534 100644 --- a/trunk/fs/ntfs/mft.c +++ b/trunk/fs/ntfs/mft.c @@ -511,7 +511,6 @@ int ntfs_sync_mft_mirror(ntfs_volume *vol, const unsigned long mft_no, } while (bh); tail->b_this_page = head; attach_page_buffers(page, head); - BUG_ON(!page_has_buffers(page)); } bh = head = page_buffers(page); BUG_ON(!bh); @@ -692,7 +691,6 @@ int write_mft_record_nolock(ntfs_inode *ni, MFT_RECORD *m, int sync) */ if (!NInoTestClearDirty(ni)) goto done; - BUG_ON(!page_has_buffers(page)); bh = head = page_buffers(page); BUG_ON(!bh); rl = NULL;