lkml.org 
[lkml]   [2012]   [Jun]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 21/21] vfs: move O_DIRECT check to common code
    Date
    From: Miklos Szeredi <mszeredi@suse.cz>

    Perform open_check_o_direct() in a common place in do_last after opening the
    file.

    Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
    ---
    fs/namei.c | 17 +++++------------
    1 files changed, 5 insertions(+), 12 deletions(-)

    diff --git a/fs/namei.c b/fs/namei.c
    index d5dd6fb..62514ae 100644
    --- a/fs/namei.c
    +++ b/fs/namei.c
    @@ -2296,22 +2296,15 @@ static struct file *atomic_open(struct nameidata *nd, struct dentry *dentry,
    * here.
    */
    error = may_open(&filp->f_path, acc_mode, open_flag);
    - if (error)
    - goto out_fput;
    -
    - error = open_check_o_direct(filp);
    - if (error)
    - goto out_fput;
    + if (error) {
    + fput(filp);
    + filp = ERR_PTR(error);
    + }

    out:
    dput(dentry);
    return filp;

    -out_fput:
    - fput(filp);
    - filp = ERR_PTR(error);
    - goto out;
    -
    no_open:
    if (need_lookup) {
    dentry = lookup_real(dir, dentry, nd);
    @@ -2610,10 +2603,10 @@ finish_open_created:
    goto stale_open;
    goto out;
    }
    +opened:
    error = open_check_o_direct(filp);
    if (error)
    goto exit_fput;
    -opened:
    error = ima_file_check(filp, op->acc_mode);
    if (error)
    goto exit_fput;
    --
    1.7.7


    \
     
     \ /
      Last update: 2012-06-05 18:41    [W:0.033 / U:32.376 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site