build fix

diff --git a/kernel/dir.c b/kernel/dir.c
index 1ae265a403ec64949338c956dbb09165ac66a7b6..e8b2d0f969900cd9764667bcf9330b21c58ebd3f 100644 (file)
--- 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 15435535ad1521b56be1d3800b0ee46c4e0d0fad..f5afa01e6640bb4c093b7d89d555b8f293eea757 100644 (file)
--- 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