Change generated with coccinelle and fixed up by hand as appropriate.
Signed-off-by: Mateusz Guzik <mjguzik@gmail.com>
---
cheat sheet:
If ->i_lock is held, then:
state = inode->i_state => state = inode_state_read(inode)
inode->i_state |= (I_A | I_B) => inode_state_set(inode, I_A | I_B)
inode->i_state &= ~(I_A | I_B) => inode_state_clear(inode, I_A | I_B)
inode->i_state = I_A | I_B => inode_state_assign(inode, I_A | I_B)
If ->i_lock is not held or only held conditionally:
state = inode->i_state => state = inode_state_read_once(inode)
inode->i_state |= (I_A | I_B) => inode_state_set_raw(inode, I_A | I_B)
inode->i_state &= ~(I_A | I_B) => inode_state_clear_raw(inode, I_A | I_B)
inode->i_state = I_A | I_B => inode_state_assign_raw(inode, I_A | I_B)
fs/ceph/cache.c | 2 +-
fs/ceph/crypto.c | 4 ++--
fs/ceph/file.c | 4 ++--
fs/ceph/inode.c | 28 ++++++++++++++--------------
4 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/fs/ceph/cache.c b/fs/ceph/cache.c
index 930fbd54d2c8..f678bab189d8 100644
--- a/fs/ceph/cache.c
+++ b/fs/ceph/cache.c
@@ -26,7 +26,7 @@ void ceph_fscache_register_inode_cookie(struct inode *inode)
return;
/* Only new inodes! */
- if (!(inode->i_state & I_NEW))
+ if (!(inode_state_read_once(inode) & I_NEW))
return;
WARN_ON_ONCE(ci->netfs.cache);
diff --git a/fs/ceph/crypto.c b/fs/ceph/crypto.c
index 7026e794813c..928746b92512 100644
--- a/fs/ceph/crypto.c
+++ b/fs/ceph/crypto.c
@@ -329,7 +329,7 @@ int ceph_encode_encrypted_dname(struct inode *parent, char *buf, int elen)
out:
kfree(cryptbuf);
if (dir != parent) {
- if ((dir->i_state & I_NEW))
+ if ((inode_state_read_once(dir) & I_NEW))
discard_new_inode(dir);
else
iput(dir);
@@ -438,7 +438,7 @@ int ceph_fname_to_usr(const struct ceph_fname *fname, struct fscrypt_str *tname,
fscrypt_fname_free_buffer(&_tname);
out_inode:
if (dir != fname->dir) {
- if ((dir->i_state & I_NEW))
+ if ((inode_state_read_once(dir) & I_NEW))
discard_new_inode(dir);
else
iput(dir);
diff --git a/fs/ceph/file.c b/fs/ceph/file.c
index 978acd3d4b32..1c9d73523b88 100644
--- a/fs/ceph/file.c
+++ b/fs/ceph/file.c
@@ -741,7 +741,7 @@ static int ceph_finish_async_create(struct inode *dir, struct inode *inode,
vino.ino, ceph_ino(dir), dentry->d_name.name);
ceph_dir_clear_ordered(dir);
ceph_init_inode_acls(inode, as_ctx);
- if (inode->i_state & I_NEW) {
+ if (inode_state_read_once(inode) & I_NEW) {
/*
* If it's not I_NEW, then someone created this before
* we got here. Assume the server is aware of it at
@@ -903,7 +903,7 @@ int ceph_atomic_open(struct inode *dir, struct dentry *dentry,
new_inode = NULL;
goto out_req;
}
- WARN_ON_ONCE(!(new_inode->i_state & I_NEW));
+ WARN_ON_ONCE(!(inode_state_read_once(new_inode) & I_NEW));
spin_lock(&dentry->d_lock);
di->flags |= CEPH_DENTRY_ASYNC_CREATE;
diff --git a/fs/ceph/inode.c b/fs/ceph/inode.c
index 949f0badc944..4044a13969ad 100644
--- a/fs/ceph/inode.c
+++ b/fs/ceph/inode.c
@@ -132,7 +132,7 @@ struct inode *ceph_new_inode(struct inode *dir, struct dentry *dentry,
goto out_err;
}
- inode->i_state = 0;
+ inode_state_assign_raw(inode, 0);
inode->i_mode = *mode;
err = ceph_security_init_secctx(dentry, *mode, as_ctx);
@@ -201,7 +201,7 @@ struct inode *ceph_get_inode(struct super_block *sb, struct ceph_vino vino,
doutc(cl, "on %llx=%llx.%llx got %p new %d\n",
ceph_present_inode(inode), ceph_vinop(inode), inode,
- !!(inode->i_state & I_NEW));
+ !!(inode_state_read_once(inode) & I_NEW));
return inode;
}
@@ -228,7 +228,7 @@ struct inode *ceph_get_snapdir(struct inode *parent)
goto err;
}
- if (!(inode->i_state & I_NEW) && !S_ISDIR(inode->i_mode)) {
+ if (!(inode_state_read_once(inode) & I_NEW) && !S_ISDIR(inode->i_mode)) {
pr_warn_once_client(cl, "bad snapdir inode type (mode=0%o)\n",
inode->i_mode);
goto err;
@@ -261,7 +261,7 @@ struct inode *ceph_get_snapdir(struct inode *parent)
}
}
#endif
- if (inode->i_state & I_NEW) {
+ if (inode_state_read_once(inode) & I_NEW) {
inode->i_op = &ceph_snapdir_iops;
inode->i_fop = &ceph_snapdir_fops;
ci->i_snap_caps = CEPH_CAP_PIN; /* so we can open */
@@ -270,7 +270,7 @@ struct inode *ceph_get_snapdir(struct inode *parent)
return inode;
err:
- if ((inode->i_state & I_NEW))
+ if ((inode_state_read_once(inode) & I_NEW))
discard_new_inode(inode);
else
iput(inode);
@@ -744,7 +744,7 @@ void ceph_evict_inode(struct inode *inode)
netfs_wait_for_outstanding_io(inode);
truncate_inode_pages_final(&inode->i_data);
- if (inode->i_state & I_PINNING_NETFS_WB)
+ if (inode_state_read_once(inode) & I_PINNING_NETFS_WB)
ceph_fscache_unuse_cookie(inode, true);
clear_inode(inode);
@@ -1013,7 +1013,7 @@ int ceph_fill_inode(struct inode *inode, struct page *locked_page,
le64_to_cpu(info->version), ci->i_version);
/* Once I_NEW is cleared, we can't change type or dev numbers */
- if (inode->i_state & I_NEW) {
+ if (inode_state_read_once(inode) & I_NEW) {
inode->i_mode = mode;
} else {
if (inode_wrong_type(inode, mode)) {
@@ -1090,7 +1090,7 @@ int ceph_fill_inode(struct inode *inode, struct page *locked_page,
#ifdef CONFIG_FS_ENCRYPTION
if (iinfo->fscrypt_auth_len &&
- ((inode->i_state & I_NEW) || (ci->fscrypt_auth_len == 0))) {
+ ((inode_state_read_once(inode) & I_NEW) || (ci->fscrypt_auth_len == 0))) {
kfree(ci->fscrypt_auth);
ci->fscrypt_auth_len = iinfo->fscrypt_auth_len;
ci->fscrypt_auth = iinfo->fscrypt_auth;
@@ -1692,13 +1692,13 @@ int ceph_fill_trace(struct super_block *sb, struct ceph_mds_request *req)
pr_err_client(cl, "badness %p %llx.%llx\n", in,
ceph_vinop(in));
req->r_target_inode = NULL;
- if (in->i_state & I_NEW)
+ if (inode_state_read_once(in) & I_NEW)
discard_new_inode(in);
else
iput(in);
goto done;
}
- if (in->i_state & I_NEW)
+ if (inode_state_read_once(in) & I_NEW)
unlock_new_inode(in);
}
@@ -1887,11 +1887,11 @@ static int readdir_prepopulate_inodes_only(struct ceph_mds_request *req,
pr_err_client(cl, "inode badness on %p got %d\n", in,
rc);
err = rc;
- if (in->i_state & I_NEW) {
+ if (inode_state_read_once(in) & I_NEW) {
ihold(in);
discard_new_inode(in);
}
- } else if (in->i_state & I_NEW) {
+ } else if (inode_state_read_once(in) & I_NEW) {
unlock_new_inode(in);
}
@@ -2103,7 +2103,7 @@ int ceph_readdir_prepopulate(struct ceph_mds_request *req,
pr_err_client(cl, "badness on %p %llx.%llx\n", in,
ceph_vinop(in));
if (d_really_is_negative(dn)) {
- if (in->i_state & I_NEW) {
+ if (inode_state_read_once(in) & I_NEW) {
ihold(in);
discard_new_inode(in);
}
@@ -2113,7 +2113,7 @@ int ceph_readdir_prepopulate(struct ceph_mds_request *req,
err = ret;
goto next_item;
}
- if (in->i_state & I_NEW)
+ if (inode_state_read_once(in) & I_NEW)
unlock_new_inode(in);
if (d_really_is_negative(dn)) {
--
2.34.1On Thu 09-10-25 09:59:21, Mateusz Guzik wrote:
> Change generated with coccinelle and fixed up by hand as appropriate.
>
> Signed-off-by: Mateusz Guzik <mjguzik@gmail.com>
Looks good. Feel free to add:
Reviewed-by: Jan Kara <jack@suse.cz>
Honza
> ---
>
> cheat sheet:
>
> If ->i_lock is held, then:
>
> state = inode->i_state => state = inode_state_read(inode)
> inode->i_state |= (I_A | I_B) => inode_state_set(inode, I_A | I_B)
> inode->i_state &= ~(I_A | I_B) => inode_state_clear(inode, I_A | I_B)
> inode->i_state = I_A | I_B => inode_state_assign(inode, I_A | I_B)
>
> If ->i_lock is not held or only held conditionally:
>
> state = inode->i_state => state = inode_state_read_once(inode)
> inode->i_state |= (I_A | I_B) => inode_state_set_raw(inode, I_A | I_B)
> inode->i_state &= ~(I_A | I_B) => inode_state_clear_raw(inode, I_A | I_B)
> inode->i_state = I_A | I_B => inode_state_assign_raw(inode, I_A | I_B)
>
> fs/ceph/cache.c | 2 +-
> fs/ceph/crypto.c | 4 ++--
> fs/ceph/file.c | 4 ++--
> fs/ceph/inode.c | 28 ++++++++++++++--------------
> 4 files changed, 19 insertions(+), 19 deletions(-)
>
> diff --git a/fs/ceph/cache.c b/fs/ceph/cache.c
> index 930fbd54d2c8..f678bab189d8 100644
> --- a/fs/ceph/cache.c
> +++ b/fs/ceph/cache.c
> @@ -26,7 +26,7 @@ void ceph_fscache_register_inode_cookie(struct inode *inode)
> return;
>
> /* Only new inodes! */
> - if (!(inode->i_state & I_NEW))
> + if (!(inode_state_read_once(inode) & I_NEW))
> return;
>
> WARN_ON_ONCE(ci->netfs.cache);
> diff --git a/fs/ceph/crypto.c b/fs/ceph/crypto.c
> index 7026e794813c..928746b92512 100644
> --- a/fs/ceph/crypto.c
> +++ b/fs/ceph/crypto.c
> @@ -329,7 +329,7 @@ int ceph_encode_encrypted_dname(struct inode *parent, char *buf, int elen)
> out:
> kfree(cryptbuf);
> if (dir != parent) {
> - if ((dir->i_state & I_NEW))
> + if ((inode_state_read_once(dir) & I_NEW))
> discard_new_inode(dir);
> else
> iput(dir);
> @@ -438,7 +438,7 @@ int ceph_fname_to_usr(const struct ceph_fname *fname, struct fscrypt_str *tname,
> fscrypt_fname_free_buffer(&_tname);
> out_inode:
> if (dir != fname->dir) {
> - if ((dir->i_state & I_NEW))
> + if ((inode_state_read_once(dir) & I_NEW))
> discard_new_inode(dir);
> else
> iput(dir);
> diff --git a/fs/ceph/file.c b/fs/ceph/file.c
> index 978acd3d4b32..1c9d73523b88 100644
> --- a/fs/ceph/file.c
> +++ b/fs/ceph/file.c
> @@ -741,7 +741,7 @@ static int ceph_finish_async_create(struct inode *dir, struct inode *inode,
> vino.ino, ceph_ino(dir), dentry->d_name.name);
> ceph_dir_clear_ordered(dir);
> ceph_init_inode_acls(inode, as_ctx);
> - if (inode->i_state & I_NEW) {
> + if (inode_state_read_once(inode) & I_NEW) {
> /*
> * If it's not I_NEW, then someone created this before
> * we got here. Assume the server is aware of it at
> @@ -903,7 +903,7 @@ int ceph_atomic_open(struct inode *dir, struct dentry *dentry,
> new_inode = NULL;
> goto out_req;
> }
> - WARN_ON_ONCE(!(new_inode->i_state & I_NEW));
> + WARN_ON_ONCE(!(inode_state_read_once(new_inode) & I_NEW));
>
> spin_lock(&dentry->d_lock);
> di->flags |= CEPH_DENTRY_ASYNC_CREATE;
> diff --git a/fs/ceph/inode.c b/fs/ceph/inode.c
> index 949f0badc944..4044a13969ad 100644
> --- a/fs/ceph/inode.c
> +++ b/fs/ceph/inode.c
> @@ -132,7 +132,7 @@ struct inode *ceph_new_inode(struct inode *dir, struct dentry *dentry,
> goto out_err;
> }
>
> - inode->i_state = 0;
> + inode_state_assign_raw(inode, 0);
> inode->i_mode = *mode;
>
> err = ceph_security_init_secctx(dentry, *mode, as_ctx);
> @@ -201,7 +201,7 @@ struct inode *ceph_get_inode(struct super_block *sb, struct ceph_vino vino,
>
> doutc(cl, "on %llx=%llx.%llx got %p new %d\n",
> ceph_present_inode(inode), ceph_vinop(inode), inode,
> - !!(inode->i_state & I_NEW));
> + !!(inode_state_read_once(inode) & I_NEW));
> return inode;
> }
>
> @@ -228,7 +228,7 @@ struct inode *ceph_get_snapdir(struct inode *parent)
> goto err;
> }
>
> - if (!(inode->i_state & I_NEW) && !S_ISDIR(inode->i_mode)) {
> + if (!(inode_state_read_once(inode) & I_NEW) && !S_ISDIR(inode->i_mode)) {
> pr_warn_once_client(cl, "bad snapdir inode type (mode=0%o)\n",
> inode->i_mode);
> goto err;
> @@ -261,7 +261,7 @@ struct inode *ceph_get_snapdir(struct inode *parent)
> }
> }
> #endif
> - if (inode->i_state & I_NEW) {
> + if (inode_state_read_once(inode) & I_NEW) {
> inode->i_op = &ceph_snapdir_iops;
> inode->i_fop = &ceph_snapdir_fops;
> ci->i_snap_caps = CEPH_CAP_PIN; /* so we can open */
> @@ -270,7 +270,7 @@ struct inode *ceph_get_snapdir(struct inode *parent)
>
> return inode;
> err:
> - if ((inode->i_state & I_NEW))
> + if ((inode_state_read_once(inode) & I_NEW))
> discard_new_inode(inode);
> else
> iput(inode);
> @@ -744,7 +744,7 @@ void ceph_evict_inode(struct inode *inode)
>
> netfs_wait_for_outstanding_io(inode);
> truncate_inode_pages_final(&inode->i_data);
> - if (inode->i_state & I_PINNING_NETFS_WB)
> + if (inode_state_read_once(inode) & I_PINNING_NETFS_WB)
> ceph_fscache_unuse_cookie(inode, true);
> clear_inode(inode);
>
> @@ -1013,7 +1013,7 @@ int ceph_fill_inode(struct inode *inode, struct page *locked_page,
> le64_to_cpu(info->version), ci->i_version);
>
> /* Once I_NEW is cleared, we can't change type or dev numbers */
> - if (inode->i_state & I_NEW) {
> + if (inode_state_read_once(inode) & I_NEW) {
> inode->i_mode = mode;
> } else {
> if (inode_wrong_type(inode, mode)) {
> @@ -1090,7 +1090,7 @@ int ceph_fill_inode(struct inode *inode, struct page *locked_page,
>
> #ifdef CONFIG_FS_ENCRYPTION
> if (iinfo->fscrypt_auth_len &&
> - ((inode->i_state & I_NEW) || (ci->fscrypt_auth_len == 0))) {
> + ((inode_state_read_once(inode) & I_NEW) || (ci->fscrypt_auth_len == 0))) {
> kfree(ci->fscrypt_auth);
> ci->fscrypt_auth_len = iinfo->fscrypt_auth_len;
> ci->fscrypt_auth = iinfo->fscrypt_auth;
> @@ -1692,13 +1692,13 @@ int ceph_fill_trace(struct super_block *sb, struct ceph_mds_request *req)
> pr_err_client(cl, "badness %p %llx.%llx\n", in,
> ceph_vinop(in));
> req->r_target_inode = NULL;
> - if (in->i_state & I_NEW)
> + if (inode_state_read_once(in) & I_NEW)
> discard_new_inode(in);
> else
> iput(in);
> goto done;
> }
> - if (in->i_state & I_NEW)
> + if (inode_state_read_once(in) & I_NEW)
> unlock_new_inode(in);
> }
>
> @@ -1887,11 +1887,11 @@ static int readdir_prepopulate_inodes_only(struct ceph_mds_request *req,
> pr_err_client(cl, "inode badness on %p got %d\n", in,
> rc);
> err = rc;
> - if (in->i_state & I_NEW) {
> + if (inode_state_read_once(in) & I_NEW) {
> ihold(in);
> discard_new_inode(in);
> }
> - } else if (in->i_state & I_NEW) {
> + } else if (inode_state_read_once(in) & I_NEW) {
> unlock_new_inode(in);
> }
>
> @@ -2103,7 +2103,7 @@ int ceph_readdir_prepopulate(struct ceph_mds_request *req,
> pr_err_client(cl, "badness on %p %llx.%llx\n", in,
> ceph_vinop(in));
> if (d_really_is_negative(dn)) {
> - if (in->i_state & I_NEW) {
> + if (inode_state_read_once(in) & I_NEW) {
> ihold(in);
> discard_new_inode(in);
> }
> @@ -2113,7 +2113,7 @@ int ceph_readdir_prepopulate(struct ceph_mds_request *req,
> err = ret;
> goto next_item;
> }
> - if (in->i_state & I_NEW)
> + if (inode_state_read_once(in) & I_NEW)
> unlock_new_inode(in);
>
> if (d_really_is_negative(dn)) {
> --
> 2.34.1
>
--
Jan Kara <jack@suse.com>
SUSE Labs, CR
© 2016 - 2025 Red Hat, Inc.