On Wed, Apr 4, 2012 at 8:46 PM, Jeff Mahoney <jeffm@xxxxxxx> wrote: > -----BEGIN PGP SIGNED MESSAGE----- > Hash: SHA1 > > On 04/04/2012 04:19 PM, Bobby Powers wrote: >> spin_is_locked always returns 0 on non-SMP systems, which causes >> btrfs to fail the mount. There is documentation pending as to why >> checking for spin_is_locked is a bad idea: >> >> https://lkml.org/lkml/2012/3/27/413 >> >> As this was the only location in fs/btrfs/extent-tree.c that did >> lock-correctness checking in a BUG_ON, simply remove it. >> >> Signed-off-by: Bobby Powers <bobbypowers@xxxxxxxxx> CC: Ilya >> Dryomov <idryomov@xxxxxxxxx> CC: Chris Mason >> <chris.mason@xxxxxxxxxx> CC: Andi Kleen <ak@xxxxxxxxxxxxxxx> CC: >> linux-btrfs@xxxxxxxxxxxxxxx CC: linux-kernel@xxxxxxxxxxxxxxx --- >> fs/btrfs/extent-tree.c | 3 --- 1 file changed, 3 deletions(-) >> >> diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c index >> a844204..c98b073 100644 --- a/fs/btrfs/extent-tree.c +++ >> b/fs/btrfs/extent-tree.c @@ -3158,9 +3158,6 @@ static u64 >> get_restripe_target(struct btrfs_fs_info *fs_info, u64 flags) >> struct btrfs_balance_control *bctl = fs_info->balance_ctl; u64 >> target = 0; >> >> - BUG_ON(!mutex_is_locked(&fs_info->volume_mutex) && - >> !spin_is_locked(&fs_info->balance_lock)); - if (!bctl) return 0; >> > > Why not replace both of these with lockdep_assert_held as Andi > suggested in his doc? The complication here is that the existing statement was asserting that _either_ volume_mutex was held _or_ balance_lock was held - lockdep_assert_held is defined as: #define lockdep_assert_held(l) WARN_ON(debug_locks && !lockdep_is_held(l)) which doesn't map to the existing logic. Although I could be missing something. Sorry for the double email, forgot to turn off html mail initially. yours, Bobby > - -Jeff > > - -- > Jeff Mahoney > SUSE Labs > -----BEGIN PGP SIGNATURE----- > Version: GnuPG v2.0.18 (GNU/Linux) > Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ > > iQIcBAEBAgAGBQJPfOtVAAoJEB57S2MheeWyew4P/ju2FiKPWvFEhShP2BQzmPPL > wYoYP9cEmuoJbr1FXnpVXRy3RJsS+Dv9IHyUt2l8WRddO5PeTC08fS3a1PsR6Lky > dnDBpOTsvBhdUPClA+9cu9HtNZ488PKALTgNX7kocVYm+vd0vkE54Iv0OWRvIMEA > 5nmm/r2MJwgQmTsFwAWojxfiSEJNzRSJ6GXZFbIfwGOaJIx7MmnPg4R3PKU1SZiF > ogKIwocfsTA/T7eplK58+EqtQnfTGTKzAbaEQvX/w1ryRRXHqD2zdk2p+zSAtpN6 > swnhu156Bb9t2EUPTv9KiYth0BoYhYy9ppdp2Wyh0hX3lYCAP1SrwBVIYCqpvdqr > CuipFWmqbupW41IjQc6bjoIwaVlGNsqwDY3NNrjR+kb29k3+/3MT8QH1ZXLhlpTB > cUixluE62J8QllW4u3Wa2mLMTqdolcWCCTdh4yUqE+8jxguXUKhoTni1vwApmkru > PM158CLPdxWCnDe1TaGcRYcBoweWPl6UDaVj8W+LdSVcYsycZhwehvDg2amX6pdg > 9QFUf25PbDzEVw99w3f2hMhRG5pERRheLqPcFUVbnqZYkZBACt9XtIYBINlREoYW > ACjr9dJszluF9dEKWOmlKhsah3gAGJJoC5+QU8oR+vpxKdrI+8vQ+NYtVhCr0hVA > CO/KEEcwNaobsCWiAbSr > =5Op/ > -----END PGP SIGNATURE----- -- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
