Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ceph: use the new ->i_state accessors

Change generated with coccinelle and fixed up by hand as appropriate.

Signed-off-by: Mateusz Guzik <mjguzik@gmail.com>
Signed-off-by: Christian Brauner <brauner@kernel.org>

authored by

Mateusz Guzik and committed by
Christian Brauner
fa49168e 7b12a794

+19 -19
+1 -1
fs/ceph/cache.c
··· 26 26 return; 27 27 28 28 /* Only new inodes! */ 29 - if (!(inode->i_state & I_NEW)) 29 + if (!(inode_state_read_once(inode) & I_NEW)) 30 30 return; 31 31 32 32 WARN_ON_ONCE(ci->netfs.cache);
+2 -2
fs/ceph/crypto.c
··· 329 329 out: 330 330 kfree(cryptbuf); 331 331 if (dir != parent) { 332 - if ((dir->i_state & I_NEW)) 332 + if ((inode_state_read_once(dir) & I_NEW)) 333 333 discard_new_inode(dir); 334 334 else 335 335 iput(dir); ··· 438 438 fscrypt_fname_free_buffer(&_tname); 439 439 out_inode: 440 440 if (dir != fname->dir) { 441 - if ((dir->i_state & I_NEW)) 441 + if ((inode_state_read_once(dir) & I_NEW)) 442 442 discard_new_inode(dir); 443 443 else 444 444 iput(dir);
+2 -2
fs/ceph/file.c
··· 740 740 vino.ino, ceph_ino(dir), dentry->d_name.name); 741 741 ceph_dir_clear_ordered(dir); 742 742 ceph_init_inode_acls(inode, as_ctx); 743 - if (inode->i_state & I_NEW) { 743 + if (inode_state_read_once(inode) & I_NEW) { 744 744 /* 745 745 * If it's not I_NEW, then someone created this before 746 746 * we got here. Assume the server is aware of it at ··· 901 901 new_inode = NULL; 902 902 goto out_req; 903 903 } 904 - WARN_ON_ONCE(!(new_inode->i_state & I_NEW)); 904 + WARN_ON_ONCE(!(inode_state_read_once(new_inode) & I_NEW)); 905 905 906 906 spin_lock(&dentry->d_lock); 907 907 di->flags |= CEPH_DENTRY_ASYNC_CREATE;
+14 -14
fs/ceph/inode.c
··· 132 132 goto out_err; 133 133 } 134 134 135 - inode->i_state = 0; 135 + inode_state_assign_raw(inode, 0); 136 136 inode->i_mode = *mode; 137 137 138 138 err = ceph_security_init_secctx(dentry, *mode, as_ctx); ··· 201 201 202 202 doutc(cl, "on %llx=%llx.%llx got %p new %d\n", 203 203 ceph_present_inode(inode), ceph_vinop(inode), inode, 204 - !!(inode->i_state & I_NEW)); 204 + !!(inode_state_read_once(inode) & I_NEW)); 205 205 return inode; 206 206 } 207 207 ··· 228 228 goto err; 229 229 } 230 230 231 - if (!(inode->i_state & I_NEW) && !S_ISDIR(inode->i_mode)) { 231 + if (!(inode_state_read_once(inode) & I_NEW) && !S_ISDIR(inode->i_mode)) { 232 232 pr_warn_once_client(cl, "bad snapdir inode type (mode=0%o)\n", 233 233 inode->i_mode); 234 234 goto err; ··· 261 261 } 262 262 } 263 263 #endif 264 - if (inode->i_state & I_NEW) { 264 + if (inode_state_read_once(inode) & I_NEW) { 265 265 inode->i_op = &ceph_snapdir_iops; 266 266 inode->i_fop = &ceph_snapdir_fops; 267 267 ci->i_snap_caps = CEPH_CAP_PIN; /* so we can open */ ··· 270 270 271 271 return inode; 272 272 err: 273 - if ((inode->i_state & I_NEW)) 273 + if ((inode_state_read_once(inode) & I_NEW)) 274 274 discard_new_inode(inode); 275 275 else 276 276 iput(inode); ··· 744 744 745 745 netfs_wait_for_outstanding_io(inode); 746 746 truncate_inode_pages_final(&inode->i_data); 747 - if (inode->i_state & I_PINNING_NETFS_WB) 747 + if (inode_state_read_once(inode) & I_PINNING_NETFS_WB) 748 748 ceph_fscache_unuse_cookie(inode, true); 749 749 clear_inode(inode); 750 750 ··· 1013 1013 le64_to_cpu(info->version), ci->i_version); 1014 1014 1015 1015 /* Once I_NEW is cleared, we can't change type or dev numbers */ 1016 - if (inode->i_state & I_NEW) { 1016 + if (inode_state_read_once(inode) & I_NEW) { 1017 1017 inode->i_mode = mode; 1018 1018 } else { 1019 1019 if (inode_wrong_type(inode, mode)) { ··· 1090 1090 1091 1091 #ifdef CONFIG_FS_ENCRYPTION 1092 1092 if (iinfo->fscrypt_auth_len && 1093 - ((inode->i_state & I_NEW) || (ci->fscrypt_auth_len == 0))) { 1093 + ((inode_state_read_once(inode) & I_NEW) || (ci->fscrypt_auth_len == 0))) { 1094 1094 kfree(ci->fscrypt_auth); 1095 1095 ci->fscrypt_auth_len = iinfo->fscrypt_auth_len; 1096 1096 ci->fscrypt_auth = iinfo->fscrypt_auth; ··· 1692 1692 pr_err_client(cl, "badness %p %llx.%llx\n", in, 1693 1693 ceph_vinop(in)); 1694 1694 req->r_target_inode = NULL; 1695 - if (in->i_state & I_NEW) 1695 + if (inode_state_read_once(in) & I_NEW) 1696 1696 discard_new_inode(in); 1697 1697 else 1698 1698 iput(in); 1699 1699 goto done; 1700 1700 } 1701 - if (in->i_state & I_NEW) 1701 + if (inode_state_read_once(in) & I_NEW) 1702 1702 unlock_new_inode(in); 1703 1703 } 1704 1704 ··· 1898 1898 pr_err_client(cl, "inode badness on %p got %d\n", in, 1899 1899 rc); 1900 1900 err = rc; 1901 - if (in->i_state & I_NEW) { 1901 + if (inode_state_read_once(in) & I_NEW) { 1902 1902 ihold(in); 1903 1903 discard_new_inode(in); 1904 1904 } 1905 - } else if (in->i_state & I_NEW) { 1905 + } else if (inode_state_read_once(in) & I_NEW) { 1906 1906 unlock_new_inode(in); 1907 1907 } 1908 1908 ··· 2114 2114 pr_err_client(cl, "badness on %p %llx.%llx\n", in, 2115 2115 ceph_vinop(in)); 2116 2116 if (d_really_is_negative(dn)) { 2117 - if (in->i_state & I_NEW) { 2117 + if (inode_state_read_once(in) & I_NEW) { 2118 2118 ihold(in); 2119 2119 discard_new_inode(in); 2120 2120 } ··· 2124 2124 err = ret; 2125 2125 goto next_item; 2126 2126 } 2127 - if (in->i_state & I_NEW) 2127 + if (inode_state_read_once(in) & I_NEW) 2128 2128 unlock_new_inode(in); 2129 2129 2130 2130 if (d_really_is_negative(dn)) {