diff options
| author | Yi Kong <yikong@google.com> | 2022-01-20 11:36:55 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-01-20 11:36:55 +0000 |
| commit | 409fdbf680fba5bba2dfc5e07ec4822eef53e1c7 (patch) | |
| tree | 9eb388f63d54045209c77cde97685bf08f67cc8b /lockdev.c | |
| parent | 370655d4a094d1a49d67ebf7f2ba56686569d204 (diff) | |
| parent | 1abb7edd2621f9fcc1610ded0b3ea5ce13f205e4 (diff) | |
| download | mtools-409fdbf680fba5bba2dfc5e07ec4822eef53e1c7.tar.gz | |
Upgrade mtools to 3.0.37 am: 39bbd9609c am: 1c7cdd90cf am: 86029800aa am: 1abb7edd26
Original change: https://android-review.googlesource.com/c/platform/external/mtools/+/1943094
Change-Id: I154bfccfcb811fe9c70571197c1e918942339fa4
Diffstat (limited to 'lockdev.c')
| -rw-r--r-- | lockdev.c | 14 |
1 files changed, 7 insertions, 7 deletions
@@ -29,7 +29,7 @@ #if (defined(HAVE_FLOCK) && defined (LOCK_EX) && (defined(LOCK_NB) || defined(ALRM))) - + # ifdef ALRM # define USE_FLOCK_W # else @@ -45,7 +45,7 @@ # else # define USE_LOCKF # endif - + #else /* LOCKF */ #if (defined(F_SETLK) && defined(F_WRLCK)) @@ -77,7 +77,7 @@ int lock_dev(int fd, int mode, struct device *dev) int ret=0; #if defined(USE_FLOCK_W) || defined(USE_LOCKF_W) || defined (USE_SETLK_W) struct sigaction alrm_action, old_alrm_action; - int old_alrm = alarm(0); + unsigned int old_alrm = alarm(0); memset(&alrm_action, 0, sizeof(alrm_action)); alrm_action.sa_handler = alrm; alrm_action.sa_flags = 0; @@ -88,7 +88,7 @@ int lock_dev(int fd, int mode, struct device *dev) #ifdef USE_FLOCK ret = flock(fd, (mode ? LOCK_EX : LOCK_SH)|LOCK_NB); #endif - + #ifdef USE_FLOCK_W ret = flock(fd, (mode ? LOCK_EX : LOCK_SH)); #endif @@ -103,7 +103,7 @@ int lock_dev(int fd, int mode, struct device *dev) else ret = 0; #endif - + #if (defined(USE_SETLK) || defined(USE_SETLK_W)) { struct flock flk; @@ -119,7 +119,7 @@ int lock_dev(int fd, int mode, struct device *dev) # endif } #endif - + #if defined(USE_FLOCK_W) || defined(USE_LOCKF_W) || defined (USE_SETLK_W) /* Cancel the alarm */ sigaction(SIGALRM, &old_alrm_action, NULL); @@ -133,7 +133,7 @@ int lock_dev(int fd, int mode, struct device *dev) return 1; } #endif - + if( #ifdef EWOULDBLOCK (errno != EWOULDBLOCK) |