rt/snapraid
1
0
Fork 0
mirror of https://github.com/amadvance/snapraid.git synced 2026-10-26 10:51:54 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

If O_NOATIME use fails with EPERM, retry without it.

Browse source
This commit is contained in:
Andrea Mazzoleni 2012-11-04 00:26:30 +01:00
parent db6ff47062
commit 2d6528fe90
4 changed files with 25 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
check.c
View file

@ -1002,7 +1002,7 @@ static int state_check_process(struct snapraid_state* state, int check, int fix,
}
/* create it */
/* do not follow links to ensure to open the real file */
/* O_NOFOLLOW: do not follow links to ensure to open the real file */
f = open(path, O_WRONLY | O_CREAT | O_TRUNC | O_BINARY | O_NOFOLLOW, 0600);
if (f == -1) {
fprintf(stderr, "Error creating empty file '%s'. %s.\n", path, strerror(errno));

16
handle.c
View file

@ -80,14 +80,15 @@ int handle_create(struct snapraid_handle* handle, struct snapraid_file* file)
return -1;
}
/* opening in sequential mode in Windows */
/* do not follow links to ensure to open the real file */
/* open for read write */
/* O_SEQUENTIAL: opening in sequential mode in Windows */
/* O_NOFOLLOW: do not follow links to ensure to open the real file */
handle->f = open(handle->path, O_RDWR | O_CREAT | O_BINARY | O_SEQUENTIAL | O_NOFOLLOW, 0600);
/* if failed for missing permission */
if (handle->f == -1 && errno == EACCES) {
/* retry without requesting write permission */
handle->f = open(handle->path, O_RDONLY | O_BINARY | O_SEQUENTIAL | O_NOFOLLOW | O_NOATIME);
handle->f = open(handle->path, O_RDONLY | O_BINARY | O_SEQUENTIAL | O_NOFOLLOW);
}
if (handle->f == -1) {
@ -158,11 +159,12 @@ int handle_open(struct snapraid_handle* handle, struct snapraid_file* file)
}
pathprint(handle->path, sizeof(handle->path), "%s%s", handle->disk->dir, file->sub);
/* opening in sequential mode in Windows */
/* do not follow links to ensure to open the real file */
handle->f = open(handle->path, O_RDONLY | O_BINARY | O_SEQUENTIAL | O_NOFOLLOW | O_NOATIME);
/* open for read */
/* O_SEQUENTIAL: opening in sequential mode in Windows */
/* O_NOFOLLOW: do not follow links to ensure to open the real file */
/* O_NOATIME: do not change access time */
handle->f = open_noatime(handle->path, O_RDONLY | O_BINARY | O_SEQUENTIAL | O_NOFOLLOW);
if (handle->f == -1) {
/* invalidate for error */
handle->file = 0;

6
parity.c
View file

@ -221,8 +221,10 @@ int parity_open(struct snapraid_parity* parity, const char* path)
pathcpy(parity->path, sizeof(parity->path), path);
/* opening in sequential mode in Windows */
parity->f = open(parity->path, O_RDONLY | O_BINARY | O_SEQUENTIAL | O_NOATIME);
/* open for read */
/* O_SEQUENTIAL: opening in sequential mode in Windows */
/* O_NOATIME: do not change access time */
parity->f = open_noatime(parity->path, O_RDONLY | O_BINARY | O_SEQUENTIAL);
if (parity->f == -1) {
fprintf(stderr, "Error opening parity file '%s'. %s.\n", parity->path, strerror(errno));
return -1;

15
portable.h
View file

@ -137,12 +137,19 @@
#define STAT_NSEC(st) -1
#endif
#ifdef O_NOATIME
/**
* Defines O_NOATIME if absent.
* O_NOATIME is used to open files in RDONLY mode avoding to update their access time.
* Open a file with the O_NOATIME flag to avoid to update the acces time.
*/
#ifndef O_NOATIME
#define O_NOATIME 0
static int open_noatime(const char* file, int flags)
{
int f = open(file, flags | O_NOATIME);
if (f == -1 && errno == EPERM)
f = open(file, flags);
return f;
}
#else
#define open_noatime open
#endif
/**