lkml.org 
[lkml]   [2010]   [Sep]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 04/12] BKL: Remove BKL from autofs4
    Date
    autofs4 uses the BKL only to guard its ioctl operations.
    This can be trivially converted to use a mutex, as we have
    done with most device drivers before.

    Signed-off-by: Arnd Bergmann <arnd@arndb.de>
    Cc: "H. Peter Anvin" <hpa@zytor.com>
    ---
    fs/autofs4/root.c | 12 +++++++-----
    1 files changed, 7 insertions(+), 5 deletions(-)

    diff --git a/fs/autofs4/root.c b/fs/autofs4/root.c
    index cb1bd38..9dd29c2 100644
    --- a/fs/autofs4/root.c
    +++ b/fs/autofs4/root.c
    @@ -19,7 +19,7 @@
    #include <linux/param.h>
    #include <linux/time.h>
    #include <linux/compat.h>
    -#include <linux/smp_lock.h>
    +#include <linux/mutex.h>

    #include "autofs_i.h"

    @@ -978,15 +978,17 @@ static int autofs4_root_ioctl_unlocked(struct inode *inode, struct file *filp,
    }
    }

    +static DEFINE_MUTEX(autofs4_ioctl_mutex);
    +
    static long autofs4_root_ioctl(struct file *filp,
    unsigned int cmd, unsigned long arg)
    {
    long ret;
    struct inode *inode = filp->f_dentry->d_inode;

    - lock_kernel();
    + mutex_lock(&autofs4_ioctl_mutex);
    ret = autofs4_root_ioctl_unlocked(inode, filp, cmd, arg);
    - unlock_kernel();
    + mutex_unlock(&autofs4_ioctl_mutex);

    return ret;
    }
    @@ -998,13 +1000,13 @@ static long autofs4_root_compat_ioctl(struct file *filp,
    struct inode *inode = filp->f_path.dentry->d_inode;
    int ret;

    - lock_kernel();
    + mutex_lock(&autofs4_ioctl_mutex);
    if (cmd == AUTOFS_IOC_READY || cmd == AUTOFS_IOC_FAIL)
    ret = autofs4_root_ioctl_unlocked(inode, filp, cmd, arg);
    else
    ret = autofs4_root_ioctl_unlocked(inode, filp, cmd,
    (unsigned long)compat_ptr(arg));
    - unlock_kernel();
    + mutex_unlock(&autofs4_ioctl_mutex);

    return ret;
    }
    --
    1.7.1


    \
     
     \ /
      Last update: 2010-09-16 19:51    [W:0.022 / U:2.176 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site