diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2013-11-19 01:44:58 +0100 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2013-11-19 01:44:58 +0100 |
| commit | 448d06e8dc5c06f111bb6baae7d456e174225729 (patch) | |
| tree | 0ddcedd3ca2d516b5e103c2b6ceee631871c651d /libdiskfs | |
| parent | 4d6828ca04636d331f9a050f05b576e489022a1f (diff) | |
| parent | e971ab1a229d1ef1d5c1e5e1ff52ec597c55270e (diff) | |
| download | hurd-448d06e8dc5c06f111bb6baae7d456e174225729.tar.gz hurd-448d06e8dc5c06f111bb6baae7d456e174225729.tar.bz2 hurd-448d06e8dc5c06f111bb6baae7d456e174225729.zip | |
Merge branch 'master' of git.savannah.gnu.org:/srv/git/hurd/hurd
Diffstat (limited to 'libdiskfs')
| -rw-r--r-- | libdiskfs/dir-renamed.c | 2 | ||||
| -rw-r--r-- | libdiskfs/io-write.c | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/libdiskfs/dir-renamed.c b/libdiskfs/dir-renamed.c index d73dc282..9b7ec3a6 100644 --- a/libdiskfs/dir-renamed.c +++ b/libdiskfs/dir-renamed.c @@ -132,7 +132,7 @@ diskfs_rename_dir (struct node *fdp, struct node *fnp, const char *fromname, if (tdp->dn_stat.st_nlink == diskfs_link_max - 1) { err = EMLINK; - return EMLINK; + goto out; } tdp->dn_stat.st_nlink++; tdp->dn_set_ctime = 1; diff --git a/libdiskfs/io-write.c b/libdiskfs/io-write.c index 26e0be43..2967c4c8 100644 --- a/libdiskfs/io-write.c +++ b/libdiskfs/io-write.c @@ -56,7 +56,6 @@ diskfs_S_io_write (struct protid *cred, goto out; } - err = 0; while (off + (off_t) datalen > np->allocsize) { err = diskfs_grow (np, off + datalen, cred); |