lkml.org 
[lkml]   [2010]   [Feb]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3/6] mqueue: simplify do_open() error handling
    Date
    It reduces code size:
    text data bss dec hex filename
    9925 72 16 10013 271d ipc/mqueue-BEFORE.o
    9885 72 16 9973 26f5 ipc/mqueue-AFTER.o

    Signed-off-by: André Goddard Rosa <andre.goddard@gmail.com>
    ---
    ipc/mqueue.c | 16 ++++++++++------
    1 files changed, 10 insertions(+), 6 deletions(-)

    diff --git a/ipc/mqueue.c b/ipc/mqueue.c
    index 04403fd..2cddf93 100644
    --- a/ipc/mqueue.c
    +++ b/ipc/mqueue.c
    @@ -657,24 +657,28 @@ out:
    static struct file *do_open(struct ipc_namespace *ipc_ns,
    struct dentry *dentry, int oflag)
    {
    + int ret;
    const struct cred *cred = current_cred();

    static const int oflag2acc[O_ACCMODE] = { MAY_READ, MAY_WRITE,
    MAY_READ | MAY_WRITE };

    if ((oflag & O_ACCMODE) == (O_RDWR | O_WRONLY)) {
    - dput(dentry);
    - mntput(ipc_ns->mq_mnt);
    - return ERR_PTR(-EINVAL);
    + ret = -EINVAL;
    + goto err;
    }

    if (inode_permission(dentry->d_inode, oflag2acc[oflag & O_ACCMODE])) {
    - dput(dentry);
    - mntput(ipc_ns->mq_mnt);
    - return ERR_PTR(-EACCES);
    + ret = -EACCES;
    + goto err;
    }

    return dentry_open(dentry, ipc_ns->mq_mnt, oflag, cred);
    +
    +err:
    + dput(dentry);
    + mntput(ipc_ns->mq_mnt);
    + return ERR_PTR(ret);
    }

    SYSCALL_DEFINE4(mq_open, const char __user *, u_name, int, oflag, mode_t, mode,
    --
    1.7.0.87.g0901d
    --
    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: 2010-02-24 08:11    [W:0.025 / U:1.292 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site