[PATCH] nfs4.1 server: fs_layout_types in supported_attrs

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Since the new .x it's "fattr4_fs_layout_types", not "fattr4_fs_layout_type"

Signed-off-by: Weston Andros Adamson <dros@xxxxxxxxxxxxxxx>
---
 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
-- 
1.8.5.2 (Apple Git-48)

--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html




[Index of Archives]     [Linux Filesystem Development]     [Linux USB Development]     [Linux Media Development]     [Video for Linux]     [Linux NILFS]     [Linux Audio Users]     [Yosemite Info]     [Linux SCSI]

  Powered by Linux