lkml.org 
[lkml]   [2006]   [Feb]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
Subject[PATCH 3/5] sysfs: Update relay file support for generic relay API.
Now with the introduction of CONFIG_REPLAY, switch to using that instead
of CONFIG_REPLAYFS_FS.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>

---

fs/sysfs/Makefile | 2 +-
fs/sysfs/dir.c | 2 +-
include/linux/sysfs.h | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)

299b10030cd85eb20daa5d14cc549cf4902eb372
diff --git a/fs/sysfs/Makefile b/fs/sysfs/Makefile
index 676bf3c..7bd4d8f 100644
--- a/fs/sysfs/Makefile
+++ b/fs/sysfs/Makefile
@@ -4,4 +4,4 @@

obj-y := inode.o file.o dir.o symlink.o mount.o bin.o \
group.o
-obj-$(CONFIG_RELAYFS_FS) += relay.o
+obj-$(CONFIG_RELAY) += relay.o
diff --git a/fs/sysfs/dir.c b/fs/sysfs/dir.c
index 379daa3..52a759b 100644
--- a/fs/sysfs/dir.c
+++ b/fs/sysfs/dir.c
@@ -87,7 +87,7 @@ static int init_file(struct inode * inod
return 0;
}

-#ifdef CONFIG_RELAYFS_FS
+#ifdef CONFIG_RELAY
static int init_relay_file(struct inode * inode)
{
extern struct file_operations relay_file_operations;
diff --git a/include/linux/sysfs.h b/include/linux/sysfs.h
index 2e75d49..0faca48 100644
--- a/include/linux/sysfs.h
+++ b/include/linux/sysfs.h
@@ -94,7 +94,7 @@ struct sysfs_dirent {
#define SYSFS_NOT_PINNED (SYSFS_KOBJ_ATTR | SYSFS_KOBJ_BIN_ATTR | \
SYSFS_KOBJ_LINK | SYSFS_KOBJ_RELAY_ATTR)

-#if defined(CONFIG_RELAYFS_FS) && defined(CONFIG_SYSFS)
+#if defined(CONFIG_RELAY) && defined(CONFIG_SYSFS)
int sysfs_create_relay_file(struct kobject *, struct relay_attribute *);
void sysfs_remove_relay_file(struct kobject *, struct relay_attribute *);
#else
@@ -106,7 +106,7 @@ static inline int sysfs_create_relay_fil
static inline void sysfs_remove_relay_file(struct kobject *kobj, struct relay_attribute *attr)
{
}
-#endif /* CONFIG_RELAYFS_FS && CONFIG_SYSFS */
+#endif /* CONFIG_RELAY && CONFIG_SYSFS */

#ifdef CONFIG_SYSFS

--
1.2.0.geb68
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

\
 
 \ /
  Last update: 2006-02-19 22:11    [W:1.765 / U:0.480 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site