From patchwork Mon Jan 20 19:46:19 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Weston Andros Adamson X-Patchwork-Id: 3514351 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 9A4B39F2D6 for ; Mon, 20 Jan 2014 19:46:33 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C61ED2011D for ; Mon, 20 Jan 2014 19:46:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CCA38200DC for ; Mon, 20 Jan 2014 19:46:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752127AbaATTqa (ORCPT ); Mon, 20 Jan 2014 14:46:30 -0500 Received: from mail-ie0-f173.google.com ([209.85.223.173]:54394 "EHLO mail-ie0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751694AbaATTqa (ORCPT ); Mon, 20 Jan 2014 14:46:30 -0500 Received: by mail-ie0-f173.google.com with SMTP id e14so8754956iej.18 for ; Mon, 20 Jan 2014 11:46:29 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=gI5xOZzG57YB4IqZcnR3w3W6VJIe4d7jfsYpgx0opsg=; b=Fxp0uJQ1a9nNwmAqOF6S1cDQ1IhxuO1BNb2TtrPgg6WmQsFYiAhm1Fo0ULgazUQpPe kEE62ML+Uw9uUuydpF9G6IvSWFVRtSsWxDnCYtzjFkxUrp5gan7XMMLTeILv8dEnUtU0 3ILapqOHvLZAgajdPBZeBfmgC2OZ2nbXDiNxj3Dr5/6UptcaBV25vo5yGBhFLoetkftl 8uN1wfS+pEPnRSQY1irURtH5lJ13Mn93Am9wFgwAXBD/y7elpGQjHJfe04G6czcXNXzh WHDA4mhCf6lVq74N+5AWDT7zzw9oLJ+3QYbEc7NfkkXi5wThMwk0S/Pg+RfTaVTz3DaU NZqA== X-Gm-Message-State: ALoCoQmaBLHMo9zfZkE5ortcbuCMboXXG88+6UlJ4p6G/Uoq29PdbN5tYAYAtzrGTfjYDT7PCjTD X-Received: by 10.50.43.134 with SMTP id w6mr14268821igl.20.1390247189631; Mon, 20 Jan 2014 11:46:29 -0800 (PST) Received: from gavrio.gateway.2wire.net (99-82-247-89.lightspeed.livnmi.sbcglobal.net. [99.82.247.89]) by mx.google.com with ESMTPSA id w4sm4860178igb.5.2014.01.20.11.46.28 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 20 Jan 2014 11:46:29 -0800 (PST) From: Weston Andros Adamson To: bfields@fieldses.org Cc: linux-nfs@vger.kernel.org, Weston Andros Adamson Subject: [PATCH pynfs] nfs4.1 server: fix typos related to file layout Date: Mon, 20 Jan 2014 14:46:19 -0500 Message-Id: <1390247179-2617-1-git-send-email-dros@primarydata.com> X-Mailer: git-send-email 1.8.3.4 (Apple Git-47) Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Spam-Status: No, score=-7.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Since the new .x it's "FATTR4_FS_LAYOUT_TYPES", not "FATTR4_FS_LAYOUT_TYPE" Signed-off-by: Weston Andros Adamson --- nfs4.1/fs.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nfs4.1/fs.py b/nfs4.1/fs.py index 0eedb3f..16e9e7c 100644 --- a/nfs4.1/fs.py +++ b/nfs4.1/fs.py @@ -353,7 +353,7 @@ class FSObject(object): NOTE permissions checking on the range has already been done """ fs = self.fs - if not fs.fattr4_supported_attrs & (1 << FATTR4_FS_LAYOUT_TYPE): + if not fs.fattr4_supported_attrs & (1 << FATTR4_FS_LAYOUT_TYPES): raise NFS4Error(NFS4ERR_LAYOUTUNAVAILABLE) try: types = fs.fattr4_fs_layout_type @@ -376,7 +376,7 @@ class FSObject(object): if arg.loca_reclaim: # STUB - this is just not supported raise NFS4Error(NFS4ERR_NO_GRACE) - if not fs.fattr4_supported_attrs & (1 << FATTR4_FS_LAYOUT_TYPE): + if not fs.fattr4_supported_attrs & (1 << FATTR4_FS_LAYOUT_TYPES): raise NFS4Error(NFS4ERR_LAYOUTUNAVAILABLE) if not self.current_layout: raise NFS4Error(NFS4ERR_BADLAYOUT, tag="File has no layout") @@ -1280,7 +1280,7 @@ class BlockLayoutFS(FileSystem): FileSystem.__init__(self, objclass=LayoutFSObj) self.fsid = (3, fsid) self.fattr4_fs_layout_type = [LAYOUT4_BLOCK_VOLUME] - self.fattr4_supported_attrs |= 1 << FATTR4_FS_LAYOUT_TYPE + self.fattr4_supported_attrs |= 1 << FATTR4_FS_LAYOUT_TYPES self.fattr4_layout_blksize = 4096 self.fattr4_supported_attrs |= 1 << FATTR4_LAYOUT_BLKSIZE self.fattr4_maxwrite = 4096 @@ -1428,7 +1428,7 @@ class FileLayoutFS(FileSystem): FileSystem.__init__(self, objclass=FSLayoutFSObj) self.fsid = (2, fsid) self.fattr4_fs_layout_type = [LAYOUT4_NFSV4_1_FILES] - self.fattr4_supported_attrs |= 1 << FATTR4_FS_LAYOUT_TYPE + self.fattr4_supported_attrs |= 1 << FATTR4_FS_LAYOUT_TYPES self.fattr4_maxwrite = 8192 self.fattr4_maxread = 8192 self.fattr4_supported_attrs |= 1 << FATTR4_MAXWRITE