f2fs: allow readpages with NULL file pointer

[mirror_ubuntu-bionic-kernel.git] / fs / ceph / xattr.c

diff --git a/fs/ceph/xattr.c b/fs/ceph/xattr.c
index 11263f102e4c914eaf849c39a35c95e33eefe3c6..3542b2c364cfd8e2c517111beee04a6191bbbe4d 100644 (file)
--- a/fs/ceph/xattr.c
+++ b/fs/ceph/xattr.c
@@ -777,7 +777,7 @@ ssize_t __ceph_getxattr(struct inode *inode, const char *name, void *value,
                spin_unlock(&ci->i_ceph_lock);
 
                /* security module gets xattr while filling trace */
-               if (current->journal_info != NULL) {
+               if (current->journal_info) {
                        pr_warn_ratelimited("sync getxattr %p "
                                            "during filling trace\n", inode);
                        return -EBUSY;
@@ -809,7 +809,7 @@ ssize_t __ceph_getxattr(struct inode *inode, const char *name, void *value,
 
        memcpy(value, xattr->val, xattr->val_len);
 
-       if (current->journal_info != NULL &&
+       if (current->journal_info &&
            !strncmp(name, XATTR_SECURITY_PREFIX, XATTR_SECURITY_PREFIX_LEN))
                ci->i_ceph_flags |= CEPH_I_SEC_INITED;
 out:
@@ -1058,7 +1058,7 @@ do_sync_unlocked:
                up_read(&mdsc->snap_rwsem);
 
        /* security module set xattr while filling trace */
-       if (current->journal_info != NULL) {
+       if (current->journal_info) {
                pr_warn_ratelimited("sync setxattr %p "
                                    "during filling trace\n", inode);
                err = -EBUSY;
@@ -1108,7 +1108,7 @@ bool ceph_security_xattr_deadlock(struct inode *in)
 {
        struct ceph_inode_info *ci;
        bool ret;
-       if (in->i_security == NULL)
+       if (!in->i_security)
                return false;
        ci = ceph_inode(in);
        spin_lock(&ci->i_ceph_lock);