Skip to content

Commit dea655c

Browse files
dhowellsAl Viro
dhowells
authored and
Al Viro
committed
VFS: fs library helpers: d_inode() annotations
library helpers called by filesystem drivers on their own inodes Signed-off-by: David Howells <dhowells@redhat.com> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
1 parent 75c3cfa commit dea655c

File tree

2 files changed

+18
-18
lines changed

2 files changed

+18
-18
lines changed

‎fs/libfs.c

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@
2222

2323
static inline int simple_positive(struct dentry *dentry)
2424
{
25-
return dentry->d_inode && !d_unhashed(dentry);
25+
return d_really_is_positive(dentry) && !d_unhashed(dentry);
2626
}
2727

2828
int simple_getattr(struct vfsmount *mnt, struct dentry *dentry,
2929
struct kstat *stat)
3030
{
31-
struct inode *inode = dentry->d_inode;
31+
struct inode *inode = d_inode(dentry);
3232
generic_fillattr(inode, stat);
3333
stat->blocks = inode->i_mapping->nrpages << (PAGE_CACHE_SHIFT - 9);
3434
return 0;
@@ -94,15 +94,15 @@ EXPORT_SYMBOL(dcache_dir_close);
9494
loff_t dcache_dir_lseek(struct file *file, loff_t offset, int whence)
9595
{
9696
struct dentry *dentry = file->f_path.dentry;
97-
mutex_lock(&dentry->d_inode->i_mutex);
97+
mutex_lock(&d_inode(dentry)->i_mutex);
9898
switch (whence) {
9999
case 1:
100100
offset += file->f_pos;
101101
case 0:
102102
if (offset >= 0)
103103
break;
104104
default:
105-
mutex_unlock(&dentry->d_inode->i_mutex);
105+
mutex_unlock(&d_inode(dentry)->i_mutex);
106106
return -EINVAL;
107107
}
108108
if (offset != file->f_pos) {
@@ -129,7 +129,7 @@ loff_t dcache_dir_lseek(struct file *file, loff_t offset, int whence)
129129
spin_unlock(&dentry->d_lock);
130130
}
131131
}
132-
mutex_unlock(&dentry->d_inode->i_mutex);
132+
mutex_unlock(&d_inode(dentry)->i_mutex);
133133
return offset;
134134
}
135135
EXPORT_SYMBOL(dcache_dir_lseek);
@@ -169,7 +169,7 @@ int dcache_readdir(struct file *file, struct dir_context *ctx)
169169
spin_unlock(&next->d_lock);
170170
spin_unlock(&dentry->d_lock);
171171
if (!dir_emit(ctx, next->d_name.name, next->d_name.len,
172-
next->d_inode->i_ino, dt_type(next->d_inode)))
172+
d_inode(next)->i_ino, dt_type(d_inode(next))))
173173
return 0;
174174
spin_lock(&dentry->d_lock);
175175
spin_lock_nested(&next->d_lock, DENTRY_D_LOCK_NESTED);
@@ -270,7 +270,7 @@ EXPORT_SYMBOL(simple_open);
270270

271271
int simple_link(struct dentry *old_dentry, struct inode *dir, struct dentry *dentry)
272272
{
273-
struct inode *inode = old_dentry->d_inode;
273+
struct inode *inode = d_inode(old_dentry);
274274

275275
inode->i_ctime = dir->i_ctime = dir->i_mtime = CURRENT_TIME;
276276
inc_nlink(inode);
@@ -304,7 +304,7 @@ EXPORT_SYMBOL(simple_empty);
304304

305305
int simple_unlink(struct inode *dir, struct dentry *dentry)
306306
{
307-
struct inode *inode = dentry->d_inode;
307+
struct inode *inode = d_inode(dentry);
308308

309309
inode->i_ctime = dir->i_ctime = dir->i_mtime = CURRENT_TIME;
310310
drop_nlink(inode);
@@ -318,7 +318,7 @@ int simple_rmdir(struct inode *dir, struct dentry *dentry)
318318
if (!simple_empty(dentry))
319319
return -ENOTEMPTY;
320320

321-
drop_nlink(dentry->d_inode);
321+
drop_nlink(d_inode(dentry));
322322
simple_unlink(dir, dentry);
323323
drop_nlink(dir);
324324
return 0;
@@ -328,16 +328,16 @@ EXPORT_SYMBOL(simple_rmdir);
328328
int simple_rename(struct inode *old_dir, struct dentry *old_dentry,
329329
struct inode *new_dir, struct dentry *new_dentry)
330330
{
331-
struct inode *inode = old_dentry->d_inode;
331+
struct inode *inode = d_inode(old_dentry);
332332
int they_are_dirs = d_is_dir(old_dentry);
333333

334334
if (!simple_empty(new_dentry))
335335
return -ENOTEMPTY;
336336

337-
if (new_dentry->d_inode) {
337+
if (d_really_is_positive(new_dentry)) {
338338
simple_unlink(new_dir, new_dentry);
339339
if (they_are_dirs) {
340-
drop_nlink(new_dentry->d_inode);
340+
drop_nlink(d_inode(new_dentry));
341341
drop_nlink(old_dir);
342342
}
343343
} else if (they_are_dirs) {
@@ -368,7 +368,7 @@ EXPORT_SYMBOL(simple_rename);
368368
*/
369369
int simple_setattr(struct dentry *dentry, struct iattr *iattr)
370370
{
371-
struct inode *inode = dentry->d_inode;
371+
struct inode *inode = d_inode(dentry);
372372
int error;
373373

374374
error = inode_change_ok(inode, iattr);

‎fs/quota/dquot.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2299,7 +2299,7 @@ int dquot_quota_on(struct super_block *sb, int type, int format_id,
22992299
if (path->dentry->d_sb != sb)
23002300
error = -EXDEV;
23012301
else
2302-
error = vfs_load_quota_inode(path->dentry->d_inode, type,
2302+
error = vfs_load_quota_inode(d_inode(path->dentry), type,
23032303
format_id, DQUOT_USAGE_ENABLED |
23042304
DQUOT_LIMITS_ENABLED);
23052305
return error;
@@ -2363,20 +2363,20 @@ int dquot_quota_on_mount(struct super_block *sb, char *qf_name,
23632363
struct dentry *dentry;
23642364
int error;
23652365

2366-
mutex_lock(&sb->s_root->d_inode->i_mutex);
2366+
mutex_lock(&d_inode(sb->s_root)->i_mutex);
23672367
dentry = lookup_one_len(qf_name, sb->s_root, strlen(qf_name));
2368-
mutex_unlock(&sb->s_root->d_inode->i_mutex);
2368+
mutex_unlock(&d_inode(sb->s_root)->i_mutex);
23692369
if (IS_ERR(dentry))
23702370
return PTR_ERR(dentry);
23712371

2372-
if (!dentry->d_inode) {
2372+
if (d_really_is_negative(dentry)) {
23732373
error = -ENOENT;
23742374
goto out;
23752375
}
23762376

23772377
error = security_quota_on(dentry);
23782378
if (!error)
2379-
error = vfs_load_quota_inode(dentry->d_inode, type, format_id,
2379+
error = vfs_load_quota_inode(d_inode(dentry), type, format_id,
23802380
DQUOT_USAGE_ENABLED | DQUOT_LIMITS_ENABLED);
23812381

23822382
out:

0 commit comments

Comments
 (0)