lkml.org 
[lkml]   [2013]   [Dec]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.11 247/272] NFSv4.2: Fix a mismatch between Linux labeled NFS and the NFSv4.2 spec
    Date
    3.11.10.1 -stable review patch.  If anyone has any objections, please let me know.

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

    From: Trond Myklebust <Trond.Myklebust@netapp.com>

    commit f3f5a0f8cc40b942f4c0ae117df82eeb65f07d4d upstream.

    In the spec, the security label attribute id is '80', which means that
    it should be bit number 80-64 == 16 in the 3rd word of the bitmap.

    Fixes: 4488cc96c581: NFS: Add NFSv4.2 protocol constants
    Cc: J. Bruce Fields <bfields@fieldses.org>
    Cc: Steve Dickson <steved@redhat.com>
    Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
    Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
    ---
    include/linux/nfs4.h | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/include/linux/nfs4.h b/include/linux/nfs4.h
    index e36dee5..3859ddb 100644
    --- a/include/linux/nfs4.h
    +++ b/include/linux/nfs4.h
    @@ -395,7 +395,7 @@ enum lock_type4 {
    #define FATTR4_WORD1_FS_LAYOUT_TYPES (1UL << 30)
    #define FATTR4_WORD2_LAYOUT_BLKSIZE (1UL << 1)
    #define FATTR4_WORD2_MDSTHRESHOLD (1UL << 4)
    -#define FATTR4_WORD2_SECURITY_LABEL (1UL << 17)
    +#define FATTR4_WORD2_SECURITY_LABEL (1UL << 16)

    /* MDS threshold bitmap bits */
    #define THRESHOLD_RD (1UL << 0)
    --
    1.8.3.2


    \
     
     \ /
      Last update: 2013-12-06 15:01    [W:4.134 / U:2.372 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site