diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2008-08-20 22:59:52 +0000 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2008-08-20 22:59:52 +0000 |
| commit | 8347a1572d4bca486038444d048001b72820b803 (patch) | |
| tree | 7d480f8f9f787e6c0b015b46cf03a4bd48379b9e | |
| parent | 7bb87a43a7462dcf44b7aabaf175fc621e9e71c3 (diff) | |
2008-08-20 Samuel Thibault <samuel.thibault@ens-lyon.org>
* dir-lookup.c (diskfs_S_dir_lookup): Revert 2008-06-06 change, as it
breaks when np == dnp.
| -rw-r--r-- | libdiskfs/ChangeLog | 5 | ||||
| -rw-r--r-- | libdiskfs/dir-lookup.c | 10 |
2 files changed, 7 insertions, 8 deletions
diff --git a/libdiskfs/ChangeLog b/libdiskfs/ChangeLog index 7384469a..60c8e90b 100644 --- a/libdiskfs/ChangeLog +++ b/libdiskfs/ChangeLog @@ -1,3 +1,8 @@ +2008-08-20 Samuel Thibault <samuel.thibault@ens-lyon.org> + + * dir-lookup.c (diskfs_S_dir_lookup): Revert 2008-06-06 change, as it + breaks when np == dnp. + 2008-06-10 Samuel Thibault <samuel.thibault@ens-lyon.org> * dir-lookup.c (diskfs_lookup): Add const qualifier to parameter diff --git a/libdiskfs/dir-lookup.c b/libdiskfs/dir-lookup.c index 05c377ff..15af20e2 100644 --- a/libdiskfs/dir-lookup.c +++ b/libdiskfs/dir-lookup.c @@ -463,10 +463,7 @@ diskfs_S_dir_lookup (struct protid *dircred, { error = diskfs_create_protid (newpo, dircred->user, &newpi); if (error) - { - mutex_unlock(&np->lock); - diskfs_release_peropen (newpo); - } + diskfs_release_peropen (newpo); } if (! error) @@ -478,10 +475,7 @@ diskfs_S_dir_lookup (struct protid *dircred, error = fshelp_acquire_lock (&np->userlock, &newpi->po->lock_status, &np->lock, LOCK_SH); if (error) - { - mutex_unlock(&np->lock); - ports_port_deref (newpi); /* Get rid of NEWPI. */ - } + ports_port_deref (newpi); /* Get rid of NEWPI. */ } if (! error) |