diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-10-02 08:45:08 -0400 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-10-02 08:45:08 -0400 |
| commit | 59458f40e25915a355d8b1d701425fe9f4f9ea23 (patch) | |
| tree | f1c9a2934df686e36d75f759ab7313b6f0e0e5f9 /fs/fuse/control.c | |
| parent | 825f9075d74028d11d7f5932f04e1b5db3022b51 (diff) | |
| parent | d834c16516d1ebec4766fc58c059bf01311e6045 (diff) | |
Merge branch 'master' into gfs2
Diffstat (limited to 'fs/fuse/control.c')
| -rw-r--r-- | fs/fuse/control.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/fuse/control.c b/fs/fuse/control.c index 79ec1f23d4d2..16b39c053d47 100644 --- a/fs/fuse/control.c +++ b/fs/fuse/control.c | |||
| @@ -116,7 +116,7 @@ int fuse_ctl_add_conn(struct fuse_conn *fc) | |||
| 116 | return 0; | 116 | return 0; |
| 117 | 117 | ||
| 118 | parent = fuse_control_sb->s_root; | 118 | parent = fuse_control_sb->s_root; |
| 119 | parent->d_inode->i_nlink++; | 119 | inc_nlink(parent->d_inode); |
| 120 | sprintf(name, "%llu", (unsigned long long) fc->id); | 120 | sprintf(name, "%llu", (unsigned long long) fc->id); |
| 121 | parent = fuse_ctl_add_dentry(parent, fc, name, S_IFDIR | 0500, 2, | 121 | parent = fuse_ctl_add_dentry(parent, fc, name, S_IFDIR | 0500, 2, |
| 122 | &simple_dir_inode_operations, | 122 | &simple_dir_inode_operations, |