lkml.org 
[lkml]   [2014]   [Oct]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.14 182/238] fsnotify/fdinfo: use named constants instead of hardcoded values
    Date
    3.14-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Andrey Vagin <avagin@openvz.org>

    commit 1fc98d11cac6dd66342e5580cb2687e5b1e9a613 upstream.

    MAX_HANDLE_SZ is equal to 128, but currently the size of pad is only 64
    bytes, so exportfs_encode_inode_fh can return an error.

    Signed-off-by: Andrey Vagin <avagin@openvz.org>
    Acked-by: Cyrill Gorcunov <gorcunov@openvz.org>
    Cc: Alexander Viro <viro@zeniv.linux.org.uk>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    fs/notify/fdinfo.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    --- a/fs/notify/fdinfo.c
    +++ b/fs/notify/fdinfo.c
    @@ -42,7 +42,7 @@ static int show_mark_fhandle(struct seq_
    {
    struct {
    struct file_handle handle;
    - u8 pad[64];
    + u8 pad[MAX_HANDLE_SZ];
    } f;
    int size, ret, i;

    @@ -50,7 +50,7 @@ static int show_mark_fhandle(struct seq_
    size = f.handle.handle_bytes >> 2;

    ret = exportfs_encode_inode_fh(inode, (struct fid *)f.handle.f_handle, &size, 0);
    - if ((ret == 255) || (ret == -ENOSPC)) {
    + if ((ret == FILEID_INVALID) || (ret == -ENOSPC)) {
    WARN_ONCE(1, "Can't encode file handler for inotify: %d\n", ret);
    return 0;
    }



    \
     
     \ /
      Last update: 2014-10-04 01:41    [W:8.018 / U:0.092 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site