Kernel/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-01-06 05:13:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

namei: get rid of pointless unlikely(read_seqcount_retry(...))

Browse Source 
read_seqcount_retry() et.al. are inlined and there's enough annotations
for compiler to figure out that those are unlikely to return non-zero.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro 2022-07-05 11:23:58 -04:00
parent 20aac6c609
commit 82ef069805
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
fs/namei.c
View File

@ -818,7 +818,7 @@ static bool try_to_unlazy_next(struct nameidata *nd, struct dentry *dentry, unsi
*/ */
if (unlikely(!lockref_get_not_dead(&dentry->d_lockref))) if (unlikely(!lockref_get_not_dead(&dentry->d_lockref)))
goto out; goto out;
if (unlikely(read_seqcount_retry(&dentry->d_seq, seq))) if (read_seqcount_retry(&dentry->d_seq, seq))
goto out_dput; goto out_dput;
/* /*
* Sequence counts matched. Now make sure that the root is * Sequence counts matched. Now make sure that the root is
@ -962,7 +962,7 @@ static int nd_jump_root(struct nameidata *nd)
d = nd->path.dentry; d = nd->path.dentry;
nd->inode = d->d_inode; nd->inode = d->d_inode;
nd->seq = nd->root_seq; nd->seq = nd->root_seq;
if (unlikely(read_seqcount_retry(&d->d_seq, nd->seq))) if (read_seqcount_retry(&d->d_seq, nd->seq))
return -ECHILD; return -ECHILD;
} else { } else {
path_put(&nd->path); path_put(&nd->path);
@ -1635,7 +1635,7 @@ static struct dentry *lookup_fast(struct nameidata *nd,
* the dentry name information from lookup. * the dentry name information from lookup.
*/ */
*inode = d_backing_inode(dentry); *inode = d_backing_inode(dentry);
if (unlikely(read_seqcount_retry(&dentry->d_seq, seq))) if (read_seqcount_retry(&dentry->d_seq, seq))
return ERR_PTR(-ECHILD); return ERR_PTR(-ECHILD);
/* /*
@ -1645,7 +1645,7 @@ static struct dentry *lookup_fast(struct nameidata *nd,
* The memory barrier in read_seqcount_begin of child is * The memory barrier in read_seqcount_begin of child is
* enough, we can use __read_seqcount_retry here. * enough, we can use __read_seqcount_retry here.
*/ */
if (unlikely(__read_seqcount_retry(&parent->d_seq, nd->seq))) if (__read_seqcount_retry(&parent->d_seq, nd->seq))
return ERR_PTR(-ECHILD); return ERR_PTR(-ECHILD);
*seqp = seq; *seqp = seq;
@ -1891,7 +1891,7 @@ static struct dentry *follow_dotdot_rcu(struct nameidata *nd,
nd->path = path; nd->path = path;
nd->inode = path.dentry->d_inode; nd->inode = path.dentry->d_inode;
nd->seq = seq; nd->seq = seq;
if (unlikely(read_seqretry(&mount_lock, nd->m_seq))) if (read_seqretry(&mount_lock, nd->m_seq))
return ERR_PTR(-ECHILD); return ERR_PTR(-ECHILD);
/* we know that mountpoint was pinned */ /* we know that mountpoint was pinned */
} }
@ -1899,13 +1899,13 @@ static struct dentry *follow_dotdot_rcu(struct nameidata *nd,
parent = old->d_parent; parent = old->d_parent;
*inodep = parent->d_inode; *inodep = parent->d_inode;
*seqp = read_seqcount_begin(&parent->d_seq); *seqp = read_seqcount_begin(&parent->d_seq);
if (unlikely(read_seqcount_retry(&old->d_seq, nd->seq))) if (read_seqcount_retry(&old->d_seq, nd->seq))
return ERR_PTR(-ECHILD); return ERR_PTR(-ECHILD);
if (unlikely(!path_connected(nd->path.mnt, parent))) if (unlikely(!path_connected(nd->path.mnt, parent)))
return ERR_PTR(-ECHILD); return ERR_PTR(-ECHILD);
return parent; return parent;
in_root: in_root:
if (unlikely(read_seqretry(&mount_lock, nd->m_seq))) if (read_seqretry(&mount_lock, nd->m_seq))
return ERR_PTR(-ECHILD); return ERR_PTR(-ECHILD);
if (unlikely(nd->flags & LOOKUP_BENEATH)) if (unlikely(nd->flags & LOOKUP_BENEATH))
return ERR_PTR(-ECHILD); return ERR_PTR(-ECHILD);
@ -1985,9 +1985,9 @@ static const char *handle_dots(struct nameidata *nd, int type)
* some fallback). * some fallback).
*/ */
smp_rmb(); smp_rmb();
if (unlikely(__read_seqcount_retry(&mount_lock.seqcount, nd->m_seq))) if (__read_seqcount_retry(&mount_lock.seqcount, nd->m_seq))
return ERR_PTR(-EAGAIN); return ERR_PTR(-EAGAIN);
if (unlikely(__read_seqcount_retry(&rename_lock.seqcount, nd->r_seq))) if (__read_seqcount_retry(&rename_lock.seqcount, nd->r_seq))
return ERR_PTR(-EAGAIN); return ERR_PTR(-EAGAIN);
} }
} }