1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
|
From 6ca221704dac6f9a267f8846ec2cc514de5c8b67 Mon Sep 17 00:00:00 2001
From: Bruce Ashfield <bruce.ashfield@windriver.com>
Date: Tue, 21 Aug 2012 22:14:49 -0400
Subject: [PATCH 5/5] unionfs: restore FD_* utility defines
commit 27cd8f513 [posix_types.h: Cleanup stale __NFDBITS and related definition]
removes the defintions for:
#define NFDBITS __NFDBITS
#define FD_SETSIZE __FD_SETSIZE
#define FD_SET(fd,fdsetp) __FD_SET(fd,fdsetp)
#define FD_CLR(fd,fdsetp) __FD_CLR(fd,fdsetp)
#define FD_ISSET(fd,fdsetp) __FD_ISSET(fd,fdsetp)
#define FD_ZERO(fdsetp) __FD_ZERO(fdsetp)
Which are still used by unionfs. We restore them to union.h for local use
by unionfs until full replacements are found.
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
fs/unionfs/union.h | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/fs/unionfs/union.h b/fs/unionfs/union.h
index 2d80523..b0c488e 100644
--- a/fs/unionfs/union.h
+++ b/fs/unionfs/union.h
@@ -676,6 +676,15 @@ extern void __show_inode_counts(const struct inode *inode,
#endif /* not CONFIG_UNION_FS_DEBUG */
+#define NFDBITS __NFDBITS
+
+#define FD_SETSIZE __FD_SETSIZE
+#define FD_SET(fd,fdsetp) __FD_SET(fd,fdsetp)
+#define FD_CLR(fd,fdsetp) __FD_CLR(fd,fdsetp)
+#define FD_ISSET(fd,fdsetp) __FD_ISSET(fd,fdsetp)
+#define FD_ZERO(fdsetp) __FD_ZERO(fdsetp)
+
+
static inline void __FD_SET(unsigned long __fd, __kernel_fd_set *__fdsetp)
{
__set_bit(__fd, __fdsetp->fds_bits);
--
1.7.10.4
|
