RepoMirrors/mars
1
0
Fork 0
mirror of https://github.com/schoebel/mars synced 2024-12-12 09:45:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

infra: allow ordered symlink creation

Browse Source
This commit is contained in:
Thomas Schoebel-Theuer 2020-03-01 15:51:00 +01:00
parent 570a429c73
commit 37348ba2c8
2 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
kernel/sy_old/strategy.h
View File

@ -197,10 +197,6 @@ extern void mars_sync(void);
extern int mars_mkdir(const char *path);
extern int mars_rmdir(const char *path);
extern int mars_unlink(const char *path);
extern int mars_symlink(const char *oldpath,
const char *newpath,
const struct lamport_time *stamp,
uid_t uid);
extern char *mars_readlink(const char *newpath);
extern int mars_rename(const char *oldpath, const char *newpath);
extern int mars_chmod(const char *path, mode_t mode);

24
kernel/sy_old/sy_generic.c
View File

@ -633,9 +633,12 @@ int mars_unlink(const char *path)
return status;
}
EXPORT_SYMBOL_GPL(mars_unlink);
int mars_symlink(const char *oldpath, const char *newpath, const struct lamport_time *stamp, uid_t uid)
static
int mars_symlink(const char *oldpath, const char *newpath,
const struct lamport_time *stamp,
uid_t uid,
bool ordered)
{
char *tmp = backskip_replace(newpath, '/', true, "/.tmp-");
mm_segment_t oldfs;
@ -658,13 +661,20 @@ int mars_symlink(const char *oldpath, const char *newpath, const struct lamport_
oldfs = get_fs();
set_fs(get_ds());
status = vfs_lstat((char*)newpath, &stat);
/* When ordered, obey the Lamport condition.
*/
if (ordered && status >= 0 && stamp &&
lamport_time_compare(&stat.mtime, stamp) > 0)
goto done_fs;
/* Some filesystems have only full second resolution.
* Thus it may happen that the new timestamp is not
* truly moving forward when called twice shortly.
* This is a _workaround_, to be replaced by a better
* method somewhen.
*/
status = vfs_lstat((char*)newpath, &stat);
if (status >= 0 &&
!stamp &&
!stat.mtime.tv_nsec &&
@ -695,13 +705,13 @@ int mars_symlink(const char *oldpath, const char *newpath, const struct lamport_
set_lamport(&times[0]);
status = mars_rename(tmp, newpath);
}
done_fs:
set_fs(oldfs);
brick_string_free(tmp);
done:
return status;
}
EXPORT_SYMBOL_GPL(mars_symlink);
char *mars_readlink(const char *newpath)
{
@ -931,7 +941,7 @@ int ordered_unlink(const char *path, const struct lamport_time *stamp, int seria
MARS_DBG("creating / updating marker '%s' mtime=%lu.%09lu\n",
marker_path,
stamp->tv_sec, stamp->tv_nsec);
status = mars_symlink(serial_str, marker_path, stamp, 0);
status = mars_symlink(serial_str, marker_path, stamp, 0, false);
}
if (marker_status < 0 ||
lamport_time_compare(stamp, &stat.mtime) >= 0) {
@ -969,7 +979,7 @@ int ordered_symlink(const char *oldpath, const char *newpath, const struct lampo
}
(void)mars_unlink(marker_path);
status = mars_symlink(oldpath, newpath, stamp, uid);
status = mars_symlink(oldpath, newpath, stamp, uid, false);
done:
mutex_unlock(&ordered_lock);
@ -1185,7 +1195,7 @@ int get_inode(char *newpath, struct mars_dent *dent)
S_ISLNK(dent->new_stat.mode)) {
char *val = mars_readlink(newpath);
if (val) {
mars_symlink(val, newpath, &tmp.mtime, 0);
mars_symlink(val, newpath, &tmp.mtime, 0, false);
brick_string_free(val);
}
}