aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--kernel/dir.c4
-rw-r--r--kernel/fuse_i.h3
2 files changed, 5 insertions, 2 deletions
diff --git a/kernel/dir.c b/kernel/dir.c
index 1ae265a..e8b2d0f 100644
--- a/kernel/dir.c
+++ b/kernel/dir.c
@@ -415,7 +415,7 @@ int fuse_do_getattr(struct inode *inode)
fuse_put_request(fc, req);
if (!err) {
if ((inode->i_mode ^ arg.attr.mode) & S_IFMT) {
-#ifndef FUSE_MAINLINE
+#ifndef KERNEL_2_6_12_PLUS
if (get_node_id(inode) != FUSE_ROOT_ID)
make_bad_inode(inode);
#else
@@ -769,7 +769,7 @@ static int fuse_setattr(struct dentry *entry, struct iattr *attr)
fuse_put_request(fc, req);
if (!err) {
if ((inode->i_mode ^ outarg.attr.mode) & S_IFMT) {
-#ifndef FUSE_MAINLINE
+#ifndef KERNEL_2_6_12_PLUS
if (get_node_id(inode) != FUSE_ROOT_ID)
make_bad_inode(inode);
#else
diff --git a/kernel/fuse_i.h b/kernel/fuse_i.h
index 1543553..f5afa01 100644
--- a/kernel/fuse_i.h
+++ b/kernel/fuse_i.h
@@ -31,6 +31,9 @@
# if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,10)
# define KERNEL_2_6_10_PLUS
# endif
+# if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,12)
+# define KERNEL_2_6_12_PLUS
+# endif
# if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,13)
# define KERNEL_2_6_13_PLUS
# endif