diff options
author | Felix Fietkau <nbd@openwrt.org> | 2013-01-29 10:48:46 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2013-01-29 10:48:46 +0000 |
commit | a0636310f8752b147ee0d1a769b6a8bcb603b2bc (patch) | |
tree | 0f48a0a61f7d54fb9e21ede8cb0d65c5c82149ea /package/system/utils/xfsprogs/patches/120-portability.patch | |
parent | eeb60d018ac3006b6e5b32e5ba29862743afe638 (diff) | |
download | master-187ad058-a0636310f8752b147ee0d1a769b6a8bcb603b2bc.tar.gz master-187ad058-a0636310f8752b147ee0d1a769b6a8bcb603b2bc.tar.bz2 master-187ad058-a0636310f8752b147ee0d1a769b6a8bcb603b2bc.zip |
move a few packages to system/utils
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35375 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/system/utils/xfsprogs/patches/120-portability.patch')
-rw-r--r-- | package/system/utils/xfsprogs/patches/120-portability.patch | 47 |
1 files changed, 47 insertions, 0 deletions
diff --git a/package/system/utils/xfsprogs/patches/120-portability.patch b/package/system/utils/xfsprogs/patches/120-portability.patch new file mode 100644 index 0000000000..1e9b533654 --- /dev/null +++ b/package/system/utils/xfsprogs/patches/120-portability.patch @@ -0,0 +1,47 @@ +commit d2aef8b3967e53fe58178f5af50fef488ee0faed +Author: Jens Muecke <jens@nons.de> +Date: Thu Jan 26 00:37:52 2012 +0100 + + 120-portability + +diff --git a/copy/xfs_copy.c b/copy/xfs_copy.c +index c01e0b9..2e2f320 100644 +--- a/copy/xfs_copy.c ++++ b/copy/xfs_copy.c +@@ -463,6 +463,15 @@ read_ag_header(int fd, xfs_agnumber_t agno, wbuf *buf, ag_header_t *ag, + } + + ++static void sig_mask(int type) ++{ ++ sigset_t mask; ++ sigemptyset(&mask); ++ sigaddset(&mask, SIGCHLD); ++ sigprocmask(type, &mask, NULL); ++} ++ ++ + void + write_wbuf(void) + { +@@ -478,9 +487,9 @@ write_wbuf(void) + if (target[i].state != INACTIVE) + pthread_mutex_unlock(&targ[i].wait); /* wake up */ + +- sigrelse(SIGCHLD); ++ sig_mask(SIG_UNBLOCK); + pthread_mutex_lock(&mainwait); +- sighold(SIGCHLD); ++ sig_mask(SIG_BLOCK); + } + + +@@ -847,7 +856,7 @@ main(int argc, char **argv) + /* set up sigchild signal handler */ + + signal(SIGCHLD, handler); +- sighold(SIGCHLD); ++ sig_mask(SIG_BLOCK); + + /* make children */ + |