From patchwork Thu Apr 17 03:10:03 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: 4005471 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 80CAABFF02 for ; Thu, 17 Apr 2014 03:10:12 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id BCD4D2034A for ; Thu, 17 Apr 2014 03:10:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C00CD20328 for ; Thu, 17 Apr 2014 03:10:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756226AbaDQDKI (ORCPT ); Wed, 16 Apr 2014 23:10:08 -0400 Received: from mail-ig0-f172.google.com ([209.85.213.172]:37556 "EHLO mail-ig0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754390AbaDQDKH (ORCPT ); Wed, 16 Apr 2014 23:10:07 -0400 Received: by mail-ig0-f172.google.com with SMTP id hn18so1818411igb.5 for ; Wed, 16 Apr 2014 20:10:06 -0700 (PDT) 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=eoaSrl11oydeWvSDKGdespgQ0FsrVLZtQZUXgc/sCR8=; b=MXtfwkZ5bGgSpksM0+9oOwZUY6Dfe/fklxtBJN/pAfYXIxnaGc80Notxus78ICslbf zyEpi8RnWVDcNOIpa93DBNdcFCF4gK1+XuKTl9ddaV+GGkQMNeNJKmFd3bcayMX9Xy4i P6Jursn3biAZR+SiYKY7r+C2MfkEittX+EMb18YGK0X/IgucVks7umjE/QdzZ1q9f+Mk TSavenG1bWRjWVkQBzCHRzO9uvYARddDlej/Wr7prt+aQFPcEGMzEKftRE0oui4Q7iSF hGk8JOuF8rLylDV6/cPps/sEGXxsScQvNlass8K7nILG/3levxscJSmctXW5bXhY6kN7 fuwg== X-Gm-Message-State: ALoCoQkM2nYnLQfiFKUBO3wxnGiVYcDOna6STXQenvdn62EmwTgFZ4wmpU1ulqbG6AWP2faMQBAQ X-Received: by 10.50.136.229 with SMTP id qd5mr13993889igb.48.1397704206545; Wed, 16 Apr 2014 20:10:06 -0700 (PDT) Received: from gavrio-wifi.robotsandstuff.fake (c-98-209-19-144.hsd1.mi.comcast.net. [98.209.19.144]) by mx.google.com with ESMTPSA id ix1sm2968384igc.15.2014.04.16.20.10.04 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 16 Apr 2014 20:10:05 -0700 (PDT) From: Weston Andros Adamson To: bfields@fieldses.org Cc: linux-nfs@vger.kernel.org, Weston Andros Adamson Subject: [PATCH] nfs4.1 server: fs_layout_types in supported_attrs Date: Wed, 16 Apr 2014 23:10:03 -0400 Message-Id: <1397704203-5421-1-git-send-email-dros@primarydata.com> X-Mailer: git-send-email 1.8.5.2 (Apple Git-48) 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.6 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 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nfs4.1/fs.py b/nfs4.1/fs.py index 16e9e7c..a63c5bf 100644 --- a/nfs4.1/fs.py +++ b/nfs4.1/fs.py @@ -356,7 +356,7 @@ class FSObject(object): if not fs.fattr4_supported_attrs & (1 << FATTR4_FS_LAYOUT_TYPES): raise NFS4Error(NFS4ERR_LAYOUTUNAVAILABLE) try: - types = fs.fattr4_fs_layout_type + types = fs.fattr4_fs_layout_types except: raise NFS4Error(NFS4ERR_LAYOUTUNAVAILABLE) if arg.loga_layout_type not in types: @@ -1279,7 +1279,7 @@ class BlockLayoutFS(FileSystem): self._nextid = 0 FileSystem.__init__(self, objclass=LayoutFSObj) self.fsid = (3, fsid) - self.fattr4_fs_layout_type = [LAYOUT4_BLOCK_VOLUME] + self.fattr4_fs_layout_types = [LAYOUT4_BLOCK_VOLUME] self.fattr4_supported_attrs |= 1 << FATTR4_FS_LAYOUT_TYPES self.fattr4_layout_blksize = 4096 self.fattr4_supported_attrs |= 1 << FATTR4_LAYOUT_BLKSIZE @@ -1427,7 +1427,7 @@ class FileLayoutFS(FileSystem): self.dsdevice = dsdevice FileSystem.__init__(self, objclass=FSLayoutFSObj) self.fsid = (2, fsid) - self.fattr4_fs_layout_type = [LAYOUT4_NFSV4_1_FILES] + self.fattr4_fs_layout_types = [LAYOUT4_NFSV4_1_FILES] self.fattr4_supported_attrs |= 1 << FATTR4_FS_LAYOUT_TYPES self.fattr4_maxwrite = 8192 self.fattr4_maxread = 8192