Skip to content

Commit a50e4a0

Browse files
author
Al Viro
committed
ufs: don't bother with lock_ufs()/unlock_ufs() for directory access
We are already serialized by ->i_mutex and operations on different directories are independent. These calls are just rudiments of blind BKL conversion and they should've been removed back then. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
1 parent 514d748 commit a50e4a0

File tree

1 file changed

+14
-40
lines changed

1 file changed

+14
-40
lines changed

‎fs/ufs/namei.c

Lines changed: 14 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -56,11 +56,9 @@ static struct dentry *ufs_lookup(struct inode * dir, struct dentry *dentry, unsi
5656
if (dentry->d_name.len > UFS_MAXNAMLEN)
5757
return ERR_PTR(-ENAMETOOLONG);
5858

59-
lock_ufs(dir->i_sb);
6059
ino = ufs_inode_by_name(dir, &dentry->d_name);
6160
if (ino)
6261
inode = ufs_iget(dir->i_sb, ino);
63-
unlock_ufs(dir->i_sb);
6462
return d_splice_alias(inode, dentry);
6563
}
6664

@@ -76,24 +74,16 @@ static int ufs_create (struct inode * dir, struct dentry * dentry, umode_t mode,
7674
bool excl)
7775
{
7876
struct inode *inode;
79-
int err;
80-
81-
UFSD("BEGIN\n");
8277

8378
inode = ufs_new_inode(dir, mode);
84-
err = PTR_ERR(inode);
79+
if (IS_ERR(inode))
80+
return PTR_ERR(inode);
8581

86-
if (!IS_ERR(inode)) {
87-
inode->i_op = &ufs_file_inode_operations;
88-
inode->i_fop = &ufs_file_operations;
89-
inode->i_mapping->a_ops = &ufs_aops;
90-
mark_inode_dirty(inode);
91-
lock_ufs(dir->i_sb);
92-
err = ufs_add_nondir(dentry, inode);
93-
unlock_ufs(dir->i_sb);
94-
}
95-
UFSD("END: err=%d\n", err);
96-
return err;
82+
inode->i_op = &ufs_file_inode_operations;
83+
inode->i_fop = &ufs_file_operations;
84+
inode->i_mapping->a_ops = &ufs_aops;
85+
mark_inode_dirty(inode);
86+
return ufs_add_nondir(dentry, inode);
9787
}
9888

9989
static int ufs_mknod(struct inode *dir, struct dentry *dentry, umode_t mode, dev_t rdev)
@@ -110,9 +100,7 @@ static int ufs_mknod(struct inode *dir, struct dentry *dentry, umode_t mode, dev
110100
init_special_inode(inode, mode, rdev);
111101
ufs_set_inode_dev(inode->i_sb, UFS_I(inode), rdev);
112102
mark_inode_dirty(inode);
113-
lock_ufs(dir->i_sb);
114103
err = ufs_add_nondir(dentry, inode);
115-
unlock_ufs(dir->i_sb);
116104
}
117105
return err;
118106
}
@@ -121,18 +109,17 @@ static int ufs_symlink (struct inode * dir, struct dentry * dentry,
121109
const char * symname)
122110
{
123111
struct super_block * sb = dir->i_sb;
124-
int err = -ENAMETOOLONG;
112+
int err;
125113
unsigned l = strlen(symname)+1;
126114
struct inode * inode;
127115

128116
if (l > sb->s_blocksize)
129-
goto out_notlocked;
117+
return -ENAMETOOLONG;
130118

131-
lock_ufs(dir->i_sb);
132119
inode = ufs_new_inode(dir, S_IFLNK | S_IRWXUGO);
133120
err = PTR_ERR(inode);
134121
if (IS_ERR(inode))
135-
goto out;
122+
return err;
136123

137124
if (l > UFS_SB(sb)->s_uspi->s_maxsymlinklen) {
138125
/* slow symlink */
@@ -149,17 +136,13 @@ static int ufs_symlink (struct inode * dir, struct dentry * dentry,
149136
}
150137
mark_inode_dirty(inode);
151138

152-
err = ufs_add_nondir(dentry, inode);
153-
out:
154-
unlock_ufs(dir->i_sb);
155-
out_notlocked:
156-
return err;
139+
return ufs_add_nondir(dentry, inode);
157140

158141
out_fail:
159142
inode_dec_link_count(inode);
160143
unlock_new_inode(inode);
161144
iput(inode);
162-
goto out;
145+
return err;
163146
}
164147

165148
static int ufs_link (struct dentry * old_dentry, struct inode * dir,
@@ -168,8 +151,6 @@ static int ufs_link (struct dentry * old_dentry, struct inode * dir,
168151
struct inode *inode = d_inode(old_dentry);
169152
int error;
170153

171-
lock_ufs(dir->i_sb);
172-
173154
inode->i_ctime = CURRENT_TIME_SEC;
174155
inode_inc_link_count(inode);
175156
ihold(inode);
@@ -180,7 +161,6 @@ static int ufs_link (struct dentry * old_dentry, struct inode * dir,
180161
iput(inode);
181162
} else
182163
d_instantiate(dentry, inode);
183-
unlock_ufs(dir->i_sb);
184164
return error;
185165
}
186166

@@ -189,7 +169,6 @@ static int ufs_mkdir(struct inode * dir, struct dentry * dentry, umode_t mode)
189169
struct inode * inode;
190170
int err;
191171

192-
lock_ufs(dir->i_sb);
193172
inode_inc_link_count(dir);
194173

195174
inode = ufs_new_inode(dir, S_IFDIR|mode);
@@ -210,12 +189,10 @@ static int ufs_mkdir(struct inode * dir, struct dentry * dentry, umode_t mode)
210189
err = ufs_add_link(dentry, inode);
211190
if (err)
212191
goto out_fail;
213-
unlock_ufs(dir->i_sb);
214192

215193
unlock_new_inode(inode);
216194
d_instantiate(dentry, inode);
217-
out:
218-
return err;
195+
return 0;
219196

220197
out_fail:
221198
inode_dec_link_count(inode);
@@ -224,8 +201,7 @@ static int ufs_mkdir(struct inode * dir, struct dentry * dentry, umode_t mode)
224201
iput (inode);
225202
out_dir:
226203
inode_dec_link_count(dir);
227-
unlock_ufs(dir->i_sb);
228-
goto out;
204+
return err;
229205
}
230206

231207
static int ufs_unlink(struct inode *dir, struct dentry *dentry)
@@ -255,7 +231,6 @@ static int ufs_rmdir (struct inode * dir, struct dentry *dentry)
255231
struct inode * inode = d_inode(dentry);
256232
int err= -ENOTEMPTY;
257233

258-
lock_ufs(dir->i_sb);
259234
if (ufs_empty_dir (inode)) {
260235
err = ufs_unlink(dir, dentry);
261236
if (!err) {
@@ -264,7 +239,6 @@ static int ufs_rmdir (struct inode * dir, struct dentry *dentry)
264239
inode_dec_link_count(dir);
265240
}
266241
}
267-
unlock_ufs(dir->i_sb);
268242
return err;
269243
}
270244

0 commit comments

Comments
 (0)