[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[hurd] 16/20: fatfs: fix error handling
From: |
Samuel Thibault |
Subject: |
[hurd] 16/20: fatfs: fix error handling |
Date: |
Sat, 23 May 2015 05:09:42 +0000 |
This is an automated email from the git hooks/post-receive script.
sthibault pushed a commit to branch upstream
in repository hurd.
commit 3ffb892a5db5ad64b87261fa01478401806894cf
Author: Justus Winter <address@hidden>
Date: Tue May 19 18:52:58 2015 +0200
fatfs: fix error handling
* fatfs/dir.c (diskfs_dirrewrite_hard): Fix error handling.
---
fatfs/dir.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/fatfs/dir.c b/fatfs/dir.c
index 9eea74c..66c95d2 100644
--- a/fatfs/dir.c
+++ b/fatfs/dir.c
@@ -728,9 +728,10 @@ diskfs_dirrewrite_hard (struct node *dp, struct node *np,
struct dirstat *ds)
entry_key.dir_inode = dp->cache_id;
entry_key.dir_offset = ((int) ds->entry) - ((int) ds->mapbuf);
err = vi_rlookup (entry_key, &inode, &vinode, 0);
-
assert (err != EINVAL);
-
+ if (err)
+ return err;
+
/* Lookup the node, we already have a reference. */
oldnp = diskfs_cached_ifind (inode);
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-hurd/hurd.git
- [hurd] branch upstream updated (b69862c -> eef94c4), Samuel Thibault, 2015/05/23
- [hurd] 06/20: libdiskfs: make struct node more compact, Samuel Thibault, 2015/05/23
- [hurd] 07/20: libdiskfs: drop unused fields from struct node, Samuel Thibault, 2015/05/23
- [hurd] 08/20: libdiskfs: fix node initialization, Samuel Thibault, 2015/05/23
- [hurd] 14/20: Fix creating named sockets inside fakeroot-hurd, Samuel Thibault, 2015/05/23
- [hurd] 09/20: libdiskfs: declare all inline functions as `extern inline', Samuel Thibault, 2015/05/23
- [hurd] 20/20: Merge remote-tracking branch 'upstream/master' into upstream, Samuel Thibault, 2015/05/23
- [hurd] 18/20: Make comment clearer, Samuel Thibault, 2015/05/23
- [hurd] 19/20: fakeroot: Fix reopening files after a chmod, Samuel Thibault, 2015/05/23
- [hurd] 16/20: fatfs: fix error handling,
Samuel Thibault <=
- [hurd] 15/20: libdiskfs: fix renaming of directories, Samuel Thibault, 2015/05/23
- [hurd] 17/20: Make sure to record only RWX open modes, Samuel Thibault, 2015/05/23
- [hurd] 01/20: ext2fs: use a seperate lock to protect nodehash, Samuel Thibault, 2015/05/23
- [hurd] 04/20: tmpfs: use a seperate lock to protect all_nodes, Samuel Thibault, 2015/05/23
- [hurd] 03/20: isofs: use a seperate lock to protect node_cache, Samuel Thibault, 2015/05/23
- [hurd] 13/20: fatfs: port to libdiskfs' node cache, Samuel Thibault, 2015/05/23
- [hurd] 12/20: isofs: port to libdiskfs' node cache, Samuel Thibault, 2015/05/23
- [hurd] 05/20: libdiskfs: lock-less reference counting of nodes, Samuel Thibault, 2015/05/23
- [hurd] 02/20: fatfs: use a seperate lock to protect nodehash, Samuel Thibault, 2015/05/23
- [hurd] 10/20: ext2fs: use fat nodes, Samuel Thibault, 2015/05/23