From: Miklos Szeredi <miklos@szeredi.hu>
Date: Thu, 20 Jan 2005 08:37:30 +0000 (+0000)
Subject: cleanup
X-Git-Tag: fuse_2_2_pre5~1
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=e22acbe5578d39e8de6d24928888330db3e21b4e;p=qemu-gpiodev%2Flibfuse.git

cleanup
---

diff --git a/kernel/dir.c b/kernel/dir.c
index 38611c5..f73b575 100644
--- 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 0405f7b..3adcb30 100644
--- 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 a82a62a..2d41df2 100644
--- 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,