aboutsummaryrefslogtreecommitdiffstats
path: root/fs/sysfs/dir.c
diff options
context:
space:
mode:
authorSteven Whitehouse <swhiteho@redhat.com>2006-10-02 08:45:08 -0400
committerSteven Whitehouse <swhiteho@redhat.com>2006-10-02 08:45:08 -0400
commit59458f40e25915a355d8b1d701425fe9f4f9ea23 (patch)
treef1c9a2934df686e36d75f759ab7313b6f0e0e5f9 /fs/sysfs/dir.c
parent825f9075d74028d11d7f5932f04e1b5db3022b51 (diff)
parentd834c16516d1ebec4766fc58c059bf01311e6045 (diff)
Merge branch 'master' into gfs2
Diffstat (limited to 'fs/sysfs/dir.c')
-rw-r--r--fs/sysfs/dir.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/sysfs/dir.c b/fs/sysfs/dir.c
index 5f3d725d1125..3aa3434621ca 100644
--- a/fs/sysfs/dir.c
+++ b/fs/sysfs/dir.c
@@ -103,7 +103,7 @@ static int init_dir(struct inode * inode)
103 inode->i_fop = &sysfs_dir_operations; 103 inode->i_fop = &sysfs_dir_operations;
104 104
105 /* directory inodes start off with i_nlink == 2 (for "." entry) */ 105 /* directory inodes start off with i_nlink == 2 (for "." entry) */
106 inode->i_nlink++; 106 inc_nlink(inode);
107 return 0; 107 return 0;
108} 108}
109 109
@@ -137,7 +137,7 @@ static int create_dir(struct kobject * k, struct dentry * p,
137 if (!error) { 137 if (!error) {
138 error = sysfs_create(*d, mode, init_dir); 138 error = sysfs_create(*d, mode, init_dir);
139 if (!error) { 139 if (!error) {
140 p->d_inode->i_nlink++; 140 inc_nlink(p->d_inode);
141 (*d)->d_op = &sysfs_dentry_ops; 141 (*d)->d_op = &sysfs_dentry_ops;
142 d_rehash(*d); 142 d_rehash(*d);
143 } 143 }