Changeset 77864 in vbox for trunk/src/VBox/Additions/linux/sharedfolders/dirops.c

Timestamp:

Mar 24, 2019 2:50:02 PM (6 years ago)

Author:

vboxsync

Message:

linux/vboxsf: More small cleanups. bugref:9172

File:

• trunk/src/VBox/Additions/linux/sharedfolders/dirops.c (modified) (2 diffs)

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

@@ -1096 +1096 @@
 static int vbsf_unlink_worker(struct inode *parent, struct dentry *dentry, int fDirectory)
 {
-    int rc, err;
     struct vbsf_super_info *sf_g = VBSF_GET_SUPER_INFO(parent->i_sb);
     struct vbsf_inode_info *sf_parent_i = VBSF_GET_INODE_INFO(parent);
     SHFLSTRING *path;
+    int rc;
 
     TRACE();
-    BUG_ON(!sf_g);
-
-    err = vbsf_path_from_dentry(sf_g, sf_parent_i, dentry, &path, __func__);
-    if (!err) {
+
+    rc = vbsf_path_from_dentry(sf_g, sf_parent_i, dentry, &path, __func__);
+    if (!rc) {
         VBOXSFREMOVEREQ *pReq = (VBOXSFREMOVEREQ *)VbglR0PhysHeapAlloc(RT_UOFFSETOF(VBOXSFREMOVEREQ, StrPath.String)
                                                                        + path->u16Size);
@@ -1123 +1122 @@
             if (RT_SUCCESS(rc)) {
                 sf_parent_i->force_restat = true; /* directory access/change time changed */
-                err = 0;
+                rc = 0;
             } else if (rc == VERR_FILE_NOT_FOUND || rc == VERR_PATH_NOT_FOUND) {
                 LogFunc(("(%d): VbglR0SfRemove(%s) failed rc=%Rrc; calling d_drop on %p\n",
                          fDirectory, path->String.ach, rc, dentry));
                 d_drop(dentry);
+                rc = 0; /** @todo ??? */
             } else {
                 LogFunc(("(%d): VbglR0SfRemove(%s) failed rc=%Rrc\n", fDirectory, path->String.ach, rc));
-                err = -RTErrConvertToErrno(rc);
+                rc = -RTErrConvertToErrno(rc);
             }
             VbglR0PhysHeapFree(pReq);
         } else
-            err = -ENOMEM;
+            rc = -ENOMEM;
         kfree(path);
     }
-    return err;
+    return rc;
 }