cleanup

diff --git a/kernel/dir.c b/kernel/dir.c
index 38611c5498515d4d93dec999c957ce09240f1f61..f73b5752c9cf924e29fa7cb345b4c6df9d0c6d86 100644 (file)
--- a/kernel/dir.c
+++ b/kernel/dir.c
@@ -416,8 +416,12 @@ 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
                        if (get_node_id(inode) != FUSE_ROOT_ID)
                                make_bad_inode(inode);
+#else
+                       make_bad_inode(inode);
+#endif
                        err = -EIO;
                } else {
                        struct fuse_inode *fi = get_fuse_inode(inode);
@@ -532,7 +536,7 @@ static int fuse_readdir(struct file *file, void *dstbuf, filldir_t filldir)
        int err;
        size_t nbytes;
        struct page *page;
-       struct inode *inode = file->f_dentry->d_inode;  
+       struct inode *inode = file->f_dentry->d_inode;
        struct fuse_conn *fc = get_fuse_conn(inode);
        struct fuse_req *req = fuse_get_request_nonint(fc);
        if (!req)
@@ -722,8 +726,12 @@ 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
                        if (get_node_id(inode) != FUSE_ROOT_ID)
                                make_bad_inode(inode);
+#else
+                       make_bad_inode(inode);
+#endif
                        err = -EIO;
                } else {
                        if (is_truncate) {

diff --git a/kernel/file.c b/kernel/file.c
index 0405f7be30da665a45098a425407a3137b069614..3adcb3055869c6d41f99e11225fafd35b93ccc95 100644 (file)
--- a/kernel/file.c
+++ b/kernel/file.c
@@ -188,7 +188,7 @@ static int fuse_fsync(struct file *file, struct dentry *de, int datasync)
 }
 
 size_t fuse_send_read_common(struct fuse_req *req, struct file *file,
-                            struct inode *inode, loff_t pos, size_t count, 
+                            struct inode *inode, loff_t pos, size_t count,
                             int isdir)
 {
        struct fuse_conn *fc = get_fuse_conn(inode);

diff --git a/kernel/inode.c b/kernel/inode.c
index a82a62abdce3f9882964d0b4d79d21f607a7a61f..2d41df224815073dce0502d8a977e2634c15ee1f 100644 (file)
--- a/kernel/inode.c
+++ b/kernel/inode.c
@@ -36,9 +36,6 @@ static kmem_cache_t *fuse_inode_cachep;
 #ifndef KERNEL_2_6
 #define kstatfs statfs
 #endif
-#ifndef FS_SAFE
-#define FS_SAFE 0
-#endif
 #ifndef MAX_LFS_FILESIZE
 #define MAX_LFS_FILESIZE (((u64)PAGE_CACHE_SIZE << (BITS_PER_LONG-1))-1)
 #endif
@@ -664,9 +661,6 @@ static struct file_system_type fuse_fs_type = {
        .name           = "fuse",
        .get_sb         = fuse_get_sb,
        .kill_sb        = kill_anon_super,
-#ifndef FUSE_MAINLINE
-       .fs_flags       = FS_SAFE,
-#endif
 };
 #else
 static struct super_block *fuse_read_super_compat(struct super_block *sb,