lkml.org 
[lkml]   [2006]   [Nov]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    SubjectRe: [2.6 patch] include/linux/nfsd/nfsfh.h:fh_unlock(): change an error to a BUG_ON()
    On Sunday November 12, bunk@stusta.de wrote:
    > >
    > > This issue has come up on lkml before. Please just convert that check
    > > for fhp->fh_dentry into a BUG_ON().
    >
    > Patch below.
    >

    Thanks. I might that the opportunity to do a bit more cleaning up
    here and suggest this version .

    NeilBrown

    ---------------------------
    Subject: Replace some warning ins nfsfh.h with BUG_ON or WARN_ON

    A couple of the warning will be followed by an Oops if they ever fire,
    so may as well be BUG_ON. Another isn't obviously fatal but has never
    been known to fire, so make it a WARN_ON.

    Cc: Adrian Bunk <bunk@stusta.de>
    Signed-off-by: Neil Brown <neilb@suse.de>

    ### Diffstat output
    ./include/linux/nfsd/nfsfh.h | 15 ++++-----------
    1 file changed, 4 insertions(+), 11 deletions(-)

    diff .prev/include/linux/nfsd/nfsfh.h ./include/linux/nfsd/nfsfh.h
    --- .prev/include/linux/nfsd/nfsfh.h 2006-11-13 15:44:24.000000000 +1100
    +++ ./include/linux/nfsd/nfsfh.h 2006-11-13 15:47:02.000000000 +1100
    @@ -217,11 +217,7 @@ void fh_put(struct svc_fh *);
    static __inline__ struct svc_fh *
    fh_copy(struct svc_fh *dst, struct svc_fh *src)
    {
    - if (src->fh_dentry || src->fh_locked) {
    - struct dentry *dentry = src->fh_dentry;
    - printk(KERN_ERR "fh_copy: copying %s/%s, already verified!\n",
    - dentry->d_parent->d_name.name, dentry->d_name.name);
    - }
    + WARN_ON(src->fh_dentry || src->fh_locked);

    *dst = *src;
    return dst;
    @@ -300,10 +296,8 @@ fh_lock_nested(struct svc_fh *fhp, unsig
    dfprintk(FILEOP, "nfsd: fh_lock(%s) locked = %d\n",
    SVCFH_fmt(fhp), fhp->fh_locked);

    - if (!fhp->fh_dentry) {
    - printk(KERN_ERR "fh_lock: fh not verified!\n");
    - return;
    - }
    + BUG_ON(!dentry);
    +
    if (fhp->fh_locked) {
    printk(KERN_WARNING "fh_lock: %s/%s already locked!\n",
    dentry->d_parent->d_name.name, dentry->d_name.name);
    @@ -328,8 +322,7 @@ fh_lock(struct svc_fh *fhp)
    static inline void
    fh_unlock(struct svc_fh *fhp)
    {
    - if (!fhp->fh_dentry)
    - printk(KERN_ERR "fh_unlock: fh not verified!\n");
    + BUG_ON(!fhp->fh_dentry);

    if (fhp->fh_locked) {
    fill_post_wcc(fhp);
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/
    \
     
     \ /
      Last update: 2006-11-13 05:55    [W:0.068 / U:1.192 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site