smb: 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>

diff --git a/fs/smb/client/cifsfs.c b/fs/smb/client/cifsfs.c
index 05b1fa76e8ccf1e86f0c174593cd6e1acb84608d..552cf46d754c951fe5907f41874a2dc477d72b6d 100644 (file)
--- a/fs/smb/client/cifsfs.c
+++ b/fs/smb/client/cifsfs.c
@@ -500,7 +500,7 @@ cifs_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)
                cifs_fscache_unuse_inode_cookie(inode, true);
        cifs_fscache_release_inode_cookie(inode);
        clear_inode(inode);

diff --git a/fs/smb/client/inode.c b/fs/smb/client/inode.c
index 239dd84a336f389237055fba87cfcbbab7dff433..cc6871234ae95a4b48ff8e703f5256e8e8fd2e96 100644 (file)
--- a/fs/smb/client/inode.c
+++ b/fs/smb/client/inode.c
@@ -101,7 +101,7 @@ cifs_revalidate_cache(struct inode *inode, struct cifs_fattr *fattr)
        cifs_dbg(FYI, "%s: revalidating inode %llu\n",
                 __func__, cifs_i->uniqueid);
 
-       if (inode->i_state & I_NEW) {
+       if (inode_state_read_once(inode) & I_NEW) {
                cifs_dbg(FYI, "%s: inode %llu is new\n",
                         __func__, cifs_i->uniqueid);
                return;
@@ -146,7 +146,7 @@ cifs_nlink_fattr_to_inode(struct inode *inode, struct cifs_fattr *fattr)
         */
        if (fattr->cf_flags & CIFS_FATTR_UNKNOWN_NLINK) {
                /* only provide fake values on a new inode */
-               if (inode->i_state & I_NEW) {
+               if (inode_state_read_once(inode) & I_NEW) {
                        if (fattr->cf_cifsattrs & ATTR_DIRECTORY)
                                set_nlink(inode, 2);
                        else
@@ -167,12 +167,12 @@ cifs_fattr_to_inode(struct inode *inode, struct cifs_fattr *fattr,
        struct cifsInodeInfo *cifs_i = CIFS_I(inode);
        struct cifs_sb_info *cifs_sb = CIFS_SB(inode->i_sb);
 
-       if (!(inode->i_state & I_NEW) &&
+       if (!(inode_state_read_once(inode) & I_NEW) &&
            unlikely(inode_wrong_type(inode, fattr->cf_mode))) {
                CIFS_I(inode)->time = 0; /* force reval */
                return -ESTALE;
        }
-       if (inode->i_state & I_NEW)
+       if (inode_state_read_once(inode) & I_NEW)
                CIFS_I(inode)->netfs.zero_point = fattr->cf_eof;
 
        cifs_revalidate_cache(inode, fattr);
@@ -194,7 +194,7 @@ cifs_fattr_to_inode(struct inode *inode, struct cifs_fattr *fattr,
        inode->i_gid = fattr->cf_gid;
 
        /* if dynperm is set, don't clobber existing mode */
-       if (inode->i_state & I_NEW ||
+       if (inode_state_read(inode) & I_NEW ||
            !(cifs_sb->mnt_cifs_flags & CIFS_MOUNT_DYNPERM))
                inode->i_mode = fattr->cf_mode;
 
@@ -236,7 +236,7 @@ cifs_fattr_to_inode(struct inode *inode, struct cifs_fattr *fattr,
 
        if (fattr->cf_flags & CIFS_FATTR_JUNCTION)
                inode->i_flags |= S_AUTOMOUNT;
-       if (inode->i_state & I_NEW) {
+       if (inode_state_read_once(inode) & I_NEW) {
                cifs_set_netfs_context(inode);
                cifs_set_ops(inode);
        }
@@ -1638,7 +1638,7 @@ retry_iget5_locked:
                cifs_fattr_to_inode(inode, fattr, false);
                if (sb->s_flags & SB_NOATIME)
                        inode->i_flags |= S_NOATIME | S_NOCMTIME;
-               if (inode->i_state & I_NEW) {
+               if (inode_state_read_once(inode) & I_NEW) {
                        inode->i_ino = hash;
                        cifs_fscache_get_inode_cookie(inode);
                        unlock_new_inode(inode);