From aa65c7a53d74685ac837aef6713ca5c0582bd52e Mon Sep 17 00:00:00 2001
From: Bruce Ashfield <bruce.ashfield@windriver.com>
Date: Tue, 21 Aug 2012 22:18:36 -0400
Subject: [PATCH] unionfs: restore FD_* utility defines
1/1 [
Author: Bruce Ashfield
Email: bruce.ashfield@windriver.com
Subject: unionfs: restore FD_* utility defines
Date: Tue, 21 Aug 2012 22:14:49 -0400
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>
]
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
.../unionfs-restore-FD_-utility-defines.patch | 47 +++++++++++++++++++
features/unionfs/unionfs.scc | 1 +
2 files changed, 48 insertions(+)
create mode 100644 features/unionfs/unionfs-restore-FD_-utility-defines.patch
diff --git a/features/unionfs/unionfs-restore-FD_-utility-defines.patch b/features/unionfs/unionfs-restore-FD_-utility-defines.patch
new file mode 100644
index 000000000..4a5fd8617
--- /dev/null
+++ b/features/unionfs/unionfs-restore-FD_-utility-defines.patch
@@ -0,0 +1,47 @@
+From 88ed4b4c4b921041c1b387cac3f64c3b2fe60c35 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] 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 files changed, 9 insertions(+), 0 deletions(-)
+
+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.5.4
+
diff --git a/features/unionfs/unionfs.scc b/features/unionfs/unionfs.scc
index 0c6484cf0..a5e272701 100644
--- a/features/unionfs/unionfs.scc
+++ b/features/unionfs/unionfs.scc
@@ -8,3 +8,4 @@ patch unionfs-change-end_writeback-to-clear_inode.patch
patch Unionfs-update-show_options-prototype.patch
patch Unionfs-use-mode_t.patch
patch unionfs-update-unionfs-fork-to-align-with-mainline.patch
+patch unionfs-restore-FD_-utility-defines.patch
--
GitLab