Backport failing umount attempt fix from trunk

diff --git a/servers/ext2/link.c b/servers/ext2/link.c
index c8c793340aa267d0b48e3545b13f5d3efa80c045..2cf634b1bf1e5e73983747f5e920e385984907b9 100644 (file)
--- a/servers/ext2/link.c
+++ b/servers/ext2/link.c
@@ -74,10 +74,13 @@ PUBLIC int fs_link()
   }
 
   /* Temporarily open the last dir */
-  if( (ip = get_inode(fs_dev, fs_m_in.REQ_DIR_INO)) == NULL)
-         return(EINVAL);
+  if( (ip = get_inode(fs_dev, fs_m_in.REQ_DIR_INO)) == NULL) {
+       put_inode(rip);
+       return(EINVAL);
+  }
 
   if (ip->i_links_count == NO_LINK) {  /* Dir does not actually exist */
+       put_inode(rip);
        put_inode(ip);
        return(ENOENT);
   }
@@ -347,6 +350,7 @@ PUBLIC int fs_rename()
 
   if (r == EENTERMOUNT || r == ELEAVEMOUNT) {
        put_inode(old_ip);
+       old_ip = NULL;
        if (r == EENTERMOUNT) r = EXDEV;        /* should this fail at all? */
        else if (r == ELEAVEMOUNT) r = EINVAL;  /* rename on dot-dot */
   }
@@ -354,12 +358,13 @@ PUBLIC int fs_rename()
   /* Get new dir inode */
   if( (new_dirp = get_inode(fs_dev, (ino_t) fs_m_in.REQ_REN_NEW_DIR)) == NULL)
        r = err_code;
-
-  if (new_dirp->i_links_count == NO_LINK) { /* Dir does not actually exist */
-       put_inode(old_ip);
-       put_inode(old_dirp);
-       put_inode(new_dirp);
-       return(ENOENT);
+  else {
+       if (new_dirp->i_links_count == NO_LINK) { /* Dir does not actually exist */
+               put_inode(old_ip);
+               put_inode(old_dirp);
+               put_inode(new_dirp);
+               return(ENOENT);
+       }
   }
 
   new_ip = advance(new_dirp, new_name, IGN_PERM); /* not required to exist */
@@ -368,6 +373,7 @@ PUBLIC int fs_rename()
    * Note that ELEAVEMOUNT is covered by the dot-dot check later. */
   if(err_code == EENTERMOUNT) {
        put_inode(new_ip);
+       new_ip = NULL;
        r = EBUSY;
   }
 

diff --git a/servers/mfs/link.c b/servers/mfs/link.c
index 82147a6638c8df62a5f6327c5597dbf7850d631b..f43e2e945e7a3fd22352186e4b314809d189345d 100644 (file)
--- a/servers/mfs/link.c
+++ b/servers/mfs/link.c
@@ -68,10 +68,13 @@ PUBLIC int fs_link()
   }
 
   /* Temporarily open the last dir */
-  if( (ip = get_inode(fs_dev, (ino_t) fs_m_in.REQ_DIR_INO)) == NULL)
-         return(EINVAL);
+  if( (ip = get_inode(fs_dev, (ino_t) fs_m_in.REQ_DIR_INO)) == NULL) {
+       put_inode(rip);
+       return(EINVAL);
+  }
 
   if (ip->i_nlinks == NO_LINK) {       /* Dir does not actually exist */
+       put_inode(rip);
        put_inode(ip);
        return(ENOENT);
   }
@@ -315,6 +318,7 @@ PUBLIC int fs_rename()
 
   if (r == EENTERMOUNT || r == ELEAVEMOUNT) {
        put_inode(old_ip);
+       old_ip = NULL;
        if (r == EENTERMOUNT) r = EXDEV;        /* should this fail at all? */
        else if (r == ELEAVEMOUNT) r = EINVAL;  /* rename on dot-dot */
   }
@@ -322,12 +326,13 @@ PUBLIC int fs_rename()
   /* Get new dir inode */ 
   if( (new_dirp = get_inode(fs_dev, (ino_t) fs_m_in.REQ_REN_NEW_DIR)) == NULL) 
        r = err_code;
-
-  if (new_dirp->i_nlinks == NO_LINK) { /* Dir does not actually exist */
-       put_inode(old_ip);
-       put_inode(old_dirp);
-       put_inode(new_dirp);
-       return(ENOENT);
+  else {
+       if (new_dirp->i_nlinks == NO_LINK) {    /* Dir does not actually exist */
+               put_inode(old_ip);
+               put_inode(old_dirp);
+               put_inode(new_dirp);
+               return(ENOENT);
+       }
   }
   
   new_ip = advance(new_dirp, new_name, IGN_PERM); /* not required to exist */
@@ -336,6 +341,7 @@ PUBLIC int fs_rename()
    * Note that ELEAVEMOUNT is covered by the dot-dot check later. */
   if(err_code == EENTERMOUNT) {
        put_inode(new_ip);
+       new_ip = NULL;
        r = EBUSY;
   }