commit e22acbe5578d39e8de6d24928888330db3e21b4e
author Miklos Szeredi <miklos@szeredi.hu> Thu Jan 20 08:37:30 2005 +0000
committer Miklos Szeredi <miklos@szeredi.hu> Thu Jan 20 08:37:30 2005 +0000
tree 40045ff18179587458ae2a50769645a1f53771b1
parent 3ead28e7b1d08517f91f70d5ec144313b0f646a9

cleanup

kernel/dir.c

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 @@
 	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 @@
 	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 @@
 	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) {