diff options
Diffstat (limited to 'fs/fuse/inode.c')
-rw-r--r-- | fs/fuse/inode.c | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/fs/fuse/inode.c b/fs/fuse/inode.c index 2e99f34b4435..739595b4196f 100644 --- a/fs/fuse/inode.c +++ b/fs/fuse/inode.c | |||
@@ -1,6 +1,6 @@ | |||
1 | /* | 1 | /* |
2 | FUSE: Filesystem in Userspace | 2 | FUSE: Filesystem in Userspace |
3 | Copyright (C) 2001-2006 Miklos Szeredi <miklos@szeredi.hu> | 3 | Copyright (C) 2001-2008 Miklos Szeredi <miklos@szeredi.hu> |
4 | 4 | ||
5 | This program can be distributed under the terms of the GNU GPL. | 5 | This program can be distributed under the terms of the GNU GPL. |
6 | See the file COPYING. | 6 | See the file COPYING. |
@@ -37,10 +37,10 @@ struct fuse_mount_data { | |||
37 | unsigned rootmode; | 37 | unsigned rootmode; |
38 | unsigned user_id; | 38 | unsigned user_id; |
39 | unsigned group_id; | 39 | unsigned group_id; |
40 | unsigned fd_present : 1; | 40 | unsigned fd_present:1; |
41 | unsigned rootmode_present : 1; | 41 | unsigned rootmode_present:1; |
42 | unsigned user_id_present : 1; | 42 | unsigned user_id_present:1; |
43 | unsigned group_id_present : 1; | 43 | unsigned group_id_present:1; |
44 | unsigned flags; | 44 | unsigned flags; |
45 | unsigned max_read; | 45 | unsigned max_read; |
46 | unsigned blksize; | 46 | unsigned blksize; |
@@ -250,7 +250,7 @@ struct inode *fuse_iget(struct super_block *sb, u64 nodeid, | |||
250 | 250 | ||
251 | fi = get_fuse_inode(inode); | 251 | fi = get_fuse_inode(inode); |
252 | spin_lock(&fc->lock); | 252 | spin_lock(&fc->lock); |
253 | fi->nlookup ++; | 253 | fi->nlookup++; |
254 | spin_unlock(&fc->lock); | 254 | spin_unlock(&fc->lock); |
255 | fuse_change_attributes(inode, attr, attr_valid, attr_version); | 255 | fuse_change_attributes(inode, attr, attr_valid, attr_version); |
256 | 256 | ||
@@ -553,8 +553,7 @@ static struct inode *get_root_inode(struct super_block *sb, unsigned mode) | |||
553 | return fuse_iget(sb, 1, 0, &attr, 0, 0); | 553 | return fuse_iget(sb, 1, 0, &attr, 0, 0); |
554 | } | 554 | } |
555 | 555 | ||
556 | struct fuse_inode_handle | 556 | struct fuse_inode_handle { |
557 | { | ||
558 | u64 nodeid; | 557 | u64 nodeid; |
559 | u32 generation; | 558 | u32 generation; |
560 | }; | 559 | }; |
@@ -952,7 +951,7 @@ static inline void unregister_fuseblk(void) | |||
952 | 951 | ||
953 | static void fuse_inode_init_once(void *foo) | 952 | static void fuse_inode_init_once(void *foo) |
954 | { | 953 | { |
955 | struct inode * inode = foo; | 954 | struct inode *inode = foo; |
956 | 955 | ||
957 | inode_init_once(inode); | 956 | inode_init_once(inode); |
958 | } | 957 | } |
@@ -1031,7 +1030,7 @@ static int __init fuse_init(void) | |||
1031 | { | 1030 | { |
1032 | int res; | 1031 | int res; |
1033 | 1032 | ||
1034 | printk("fuse init (API version %i.%i)\n", | 1033 | printk(KERN_INFO "fuse init (API version %i.%i)\n", |
1035 | FUSE_KERNEL_VERSION, FUSE_KERNEL_MINOR_VERSION); | 1034 | FUSE_KERNEL_VERSION, FUSE_KERNEL_MINOR_VERSION); |
1036 | 1035 | ||
1037 | INIT_LIST_HEAD(&fuse_conn_list); | 1036 | INIT_LIST_HEAD(&fuse_conn_list); |