diff options
author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2019-04-28 20:44:34 +0200 |
---|---|---|
committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2019-04-28 20:44:34 +0200 |
commit | 31ff1ee3d4b344a5c17fb04f5cf100db6222ecf0 (patch) | |
tree | 66e57840601adeece1c37bb559c15a8074812d15 /libdiskfs/dir-rename.c | |
parent | da27fb577d5f0b3e86c5ea0408383eef7a7bef2e (diff) | |
download | hurd-31ff1ee3d4b344a5c17fb04f5cf100db6222ecf0.tar.gz hurd-31ff1ee3d4b344a5c17fb04f5cf100db6222ecf0.tar.bz2 hurd-31ff1ee3d4b344a5c17fb04f5cf100db6222ecf0.zip |
diskfs: Fix rename_dir(excl=1) for source directories
Starting from coreutils 8.30 which uses
renameat2(flag=RENAME_NOREPLACE), we need to have excl=1 to behave
correctly, notably in this case:
$ mkdir a
$ mkdir b
$ touch b/t
$ mv b a
diskfs_rename("b", "a", excl=1) called by mv shall return EEXIST.
* libdiskfs/diskfs.h (diskfs_rename_dir): Add `excl' parameter.
* doc/hurd.texi (diskfs_rename_dir): Document `excl' parameter.
* libdiskfs/dir-renamed.c (diskfs_rename_dir): Add `excl' parameter.
Return EEXIST when target exists and `excl' is not 0.
* libdiskfs/dir-rename.c (diskfs_S_dir_rename): Pass `excl' to
diskfs_rename_dir.
Diffstat (limited to 'libdiskfs/dir-rename.c')
-rw-r--r-- | libdiskfs/dir-rename.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libdiskfs/dir-rename.c b/libdiskfs/dir-rename.c index 9ac48398..90f7c683 100644 --- a/libdiskfs/dir-rename.c +++ b/libdiskfs/dir-rename.c @@ -80,7 +80,7 @@ diskfs_S_dir_rename (struct protid *fromcred, goto try_again; } err = diskfs_rename_dir (fdp, fnp, fromname, tdp, toname, fromcred, - tocred); + tocred, excl); if (diskfs_synchronous) { pthread_mutex_lock (&fdp->lock); |