From: Weston Andros Adamson <dros@primarydata.com>
To: bfields@fieldses.org
Cc: linux-nfs@vger.kernel.org, Weston Andros Adamson <dros@primarydata.com>
Subject: [PATCH pynfs] nfs4.1 server: fix typos related to file layout
Date: Mon, 20 Jan 2014 14:46:19 -0500 [thread overview]
Message-ID: <1390247179-2617-1-git-send-email-dros@primarydata.com> (raw)
Since the new .x it's "FATTR4_FS_LAYOUT_TYPES", not "FATTR4_FS_LAYOUT_TYPE"
Signed-off-by: Weston Andros Adamson <dros@primarydata.com>
---
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
--
1.8.3.4 (Apple Git-47)
next reply other threads:[~2014-01-20 19:46 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-01-20 19:46 Weston Andros Adamson [this message]
2014-01-22 17:26 ` [PATCH pynfs] nfs4.1 server: fix typos related to file layout J. Bruce Fields
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1390247179-2617-1-git-send-email-dros@primarydata.com \
--to=dros@primarydata.com \
--cc=bfields@fieldses.org \
--cc=linux-nfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox