lkml.org 
[lkml]   [2011]   [Oct]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3/7] Make shrink_dcache_for_umount_subtree() use the core assertion code
    Date
    Make shrink_dcache_for_umount_subtree() use the core assertion code rather than
    doing printk() then BUG() so that the annotation appears _after_ the "cut here"
    line instead of before it.

    Signed-off-by: David Howells <dhowells@redhat.com>
    ---

    fs/dcache.c | 9 ++++-----
    1 files changed, 4 insertions(+), 5 deletions(-)

    diff --git a/fs/dcache.c b/fs/dcache.c
    index a88948b..29f9e44 100644
    --- a/fs/dcache.c
    +++ b/fs/dcache.c
    @@ -36,6 +36,7 @@
    #include <linux/bit_spinlock.h>
    #include <linux/rculist_bl.h>
    #include <linux/prefetch.h>
    +#include <linux/assert.h>
    #include "internal.h"

    /*
    @@ -858,9 +859,9 @@ static void shrink_dcache_for_umount_subtree(struct dentry *dentry)
    dentry_lru_del(dentry);
    __d_shrink(dentry);

    - if (dentry->d_count != 0) {
    - printk(KERN_ERR
    - "BUG: Dentry %p{i=%lx,n=%s}"
    + if (unlikely(dentry->d_count != 0))
    + assertion_failed(
    + "Dentry %p{i=%lx,n=%s}"
    " still in use (%d)"
    " [unmount of %s %s]\n",
    dentry,
    @@ -870,8 +871,6 @@ static void shrink_dcache_for_umount_subtree(struct dentry *dentry)
    dentry->d_count,
    dentry->d_sb->s_type->name,
    dentry->d_sb->s_id);
    - BUG();
    - }

    if (IS_ROOT(dentry)) {
    parent = NULL;


    \
     
     \ /
      Last update: 2011-10-12 18:51    [W:0.036 / U:0.304 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site