Changeset 90582 in vbox

Timestamp:

Aug 9, 2021 8:23:33 PM (4 years ago)

Author:

vboxsync

Message:

linux/vboxsf: Avoid making the code even more spaghetti-like, indentation fixes and comments. (How difficult can this be?) bugref:10066

File:

• trunk/src/VBox/Additions/linux/sharedfolders/regops.c (modified) (8 diffs)

trunk/src/VBox/Additions/linux/sharedfolders/regops.c

@@ -75 +75 @@
 #if RTLNX_VER_MAX(2,5,12)
 # define PageUptodate(a_pPage) Page_Uptodate(a_pPage)
+#endif
+
+
+/*********************************************************************************************************************************
+*   Defined Constants And Macros                                                                                                 *
+*********************************************************************************************************************************/
+/** @def  VBSF_GET_ITER_TYPE
+ * Accessor for getting iov iter type member which changed name in 5.14. */
+#if RTLNX_VER_MIN(5,14,0)
+# define VBSF_GET_ITER_TYPE(a_pIter) ((a_pIter)->iter_type)
+#else
+# define VBSF_GET_ITER_TYPE(a_pIter) ((a_pIter)->iter)
 #endif
 
@@ -2127 +2139 @@
 
     Assert(iov_iter_count(iter) + pStash->cb > 0);
-# if RTLNX_VER_MIN(5,14,0)
-    if (!(iter->iter_type & ITER_KVEC)) {
-#else
-    if (!(iter->type & ITER_KVEC)) {
-#endif
+    if (!(VBSF_GET_ITER_TYPE(iter) & ITER_KVEC)) {
         /*
          * Do we have a stashed page?
@@ -2377 +2385 @@
 {
     size_t cPages;
-#if RTLNX_VER_MIN(5,14,0)
-    if (iter_is_iovec(iter) || (iter->iter_type & ITER_KVEC)) {
-#elif RTLNX_VER_MIN(3,16,0)
-    if (iter_is_iovec(iter) || (iter->type & ITER_KVEC)) {
-#endif
+# if RTLNX_VER_MIN(3,16,0)
+    if (iter_is_iovec(iter) || (VBSF_GET_ITER_TYPE(iter) & ITER_KVEC)) {
+# endif
         const struct iovec *pCurIov    = iter->iov;
         size_t              cLeft      = iter->nr_segs;
@@ -2443 +2449 @@
         /* Won't bother with accurate counts for the next two types, just make
            some rough estimates (does pipes have segments?): */
-#  if RTLNX_VER_MIN(5,14,0)
-        size_t cSegs = iter->iter_type & ITER_BVEC ? RT_MAX(1, iter->nr_segs) : 1;
-#  else
-        size_t cSegs = iter->type & ITER_BVEC ? RT_MAX(1, iter->nr_segs) : 1;
-#endif
+        size_t cSegs = VBSF_GET_ITER_TYPE(iter) & ITER_BVEC ? RT_MAX(1, iter->nr_segs) : 1;
         cPages = (iov_iter_count(iter) + (PAGE_SIZE * 2 - 2) * cSegs) >> PAGE_SHIFT;
     }
@@ -2599 +2601 @@
     struct vbsf_super_info *pSuperInfo = VBSF_GET_SUPER_INFO(inode->i_sb);
 
-#if RTLNX_VER_MIN(5,14,0)
     SFLOGFLOW(("vbsf_reg_read_iter: inode=%p file=%p size=%#zx off=%#llx type=%#x\n",
-               inode, kio->ki_filp, cbToRead, kio->ki_pos, iter->iter_type));
-#else
-    SFLOGFLOW(("vbsf_reg_read_iter: inode=%p file=%p size=%#zx off=%#llx type=%#x\n",
-               inode, kio->ki_filp, cbToRead, kio->ki_pos, iter->type));
-#endif
-
+               inode, kio->ki_filp, cbToRead, kio->ki_pos, VBSF_GET_ITER_TYPE(iter) ));
     AssertReturn(S_ISREG(inode->i_mode), -EINVAL);
 
@@ -2840 +2836 @@
 # endif
 
-#if RTLNX_VER_MIN(5,14,0)
+
     SFLOGFLOW(("vbsf_reg_write_iter: inode=%p file=%p size=%#zx off=%#llx type=%#x\n",
-               inode, kio->ki_filp, cbToWrite, offFile, iter->iter_type));
-#else
-    SFLOGFLOW(("vbsf_reg_write_iter: inode=%p file=%p size=%#zx off=%#llx type=%#x\n",
-               inode, kio->ki_filp, cbToWrite, offFile, iter->type));
-#endif
+               inode, kio->ki_filp, cbToWrite, offFile, VBSF_GET_ITER_TYPE(iter) ));
     AssertReturn(S_ISREG(inode->i_mode), -EINVAL);
 
@@ -3759 +3751 @@
 
 #if RTLNX_VER_MIN(5,14,0)
+/**
+ * Companion to vbsf_write_begin (i.e. shouldn't be called).
+ */
 static int vbsf_write_end(struct file *file, struct address_space *mapping,
-                loff_t pos, unsigned int len, unsigned int copied,
-                struct page *page, void *fsdata)
+                          loff_t pos, unsigned int len, unsigned int copied,
+                          struct page *page, void *fsdata)
 {
     static uint64_t volatile s_cCalls = 0;
@@ -3774 +3769 @@
 # endif
     }
-
     return -ENOTSUPP;
 }
-#endif
+#endif /* KERNEL_VERSION >= 5.14.0 */
+
 
 #if RTLNX_VER_MIN(2,4,10)