Changeset 6491f67 in rtems


Ignore:
Timestamp:
Feb 9, 2012, 11:00:15 AM (8 years ago)
Author:
Sebastian Huber <sebastian.huber@…>
Branches:
4.11, master
Children:
28a0887
Parents:
23c6f93a
git-author:
Sebastian Huber <sebastian.huber@…> (02/09/12 11:00:15)
git-committer:
Sebastian Huber <sebastian.huber@…> (02/10/12 09:42:45)
Message:

Moved empty test in front of busy tests

File:
1 edited

Legend:

Unmodified
Added
Removed
  • cpukit/libfs/src/dosfs/msdos_dir.c

    r23c6f93a r6491f67  
    642642
    643643    /*
     644     * You cannot remove a node that still has children
     645     */
     646    rc = msdos_dir_is_empty(pathloc->mt_entry, fat_fd, &is_empty);
     647    if (rc != RC_OK)
     648    {
     649        rtems_semaphore_release(fs_info->vol_sema);
     650        return rc;
     651    }
     652
     653    if (!is_empty)
     654    {
     655        rtems_semaphore_release(fs_info->vol_sema);
     656        rtems_set_errno_and_return_minus_one(ENOTEMPTY);
     657    }
     658
     659    /*
    644660     * We deny attempts to delete open directory (if directory is current
    645661     * directory we assume it is open one)
     
    652668
    653669    /*
    654      * You cannot remove a node that still has children
    655      */
    656     rc = msdos_dir_is_empty(pathloc->mt_entry, fat_fd, &is_empty);
    657     if (rc != RC_OK)
    658     {
    659         rtems_semaphore_release(fs_info->vol_sema);
    660         return rc;
    661     }
    662 
    663     if (!is_empty)
    664     {
    665         rtems_semaphore_release(fs_info->vol_sema);
    666         rtems_set_errno_and_return_minus_one(ENOTEMPTY);
    667     }
    668 
    669     /*
    670670     * You cannot remove the file system root node.
    671671     */
Note: See TracChangeset for help on using the changeset viewer.