[CIFS] convert usage of implicit booleans to bool (4b18f2a9) · Commits · e / devices / android_kernel_fairphone_FP4

fs/cifs/asn1.c

+5 −5

Original line number	Diff line number	Diff line
		@@ -460,8 +460,8 @@ decode_negTokenInit(unsigned char *security_blob, int length,
		unsigned char *sequence_end;
		unsigned long *oid = NULL;
		unsigned int cls, con, tag, oidlen, rc;
		int use_ntlmssp = FALSE;
		int use_kerberos = FALSE;
		bool use_ntlmssp = false;
		bool use_kerberos = false;

		secType = NTLM; / BB eventually make Kerberos or NLTMSSP the default*/

		@@ -561,15 +561,15 @@ decode_negTokenInit(unsigned char *security_blob, int length,
		if (compare_oid(oid, oidlen,
		MSKRB5_OID,
		MSKRB5_OID_LEN))
		use_kerberos = TRUE;
		use_kerberos = true;
		else if (compare_oid(oid, oidlen,
		KRB5_OID,
		KRB5_OID_LEN))
		use_kerberos = TRUE;
		use_kerberos = true;
		else if (compare_oid(oid, oidlen,
		NTLMSSP_OID,
		NTLMSSP_OID_LEN))
		use_ntlmssp = TRUE;
		use_ntlmssp = true;

		kfree(oid);
		}

fs/cifs/cifsacl.c

+8 −8

Original line number	Diff line number	Diff line
		@@ -559,7 +559,7 @@ static struct cifs_ntsd get_cifs_acl(u32 pacllen, struct inode *inode,
		const char path, const __u16 pfid)
		{
		struct cifsFileInfo *open_file = NULL;
		int unlock_file = FALSE;
		bool unlock_file = false;
		int xid;
		int rc = -EIO;
		__u16 fid;
		@@ -586,10 +586,10 @@ static struct cifs_ntsd get_cifs_acl(u32 pacllen, struct inode *inode,
		cifs_sb = CIFS_SB(sb);

		if (open_file) {
		unlock_file = TRUE;
		unlock_file = true;
		fid = open_file->netfid;
		} else if (pfid == NULL) {
		int oplock = FALSE;
		bool oplock = false;
		/* open file */
		rc = CIFSSMBOpen(xid, cifs_sb->tcon, path, FILE_OPEN,
		READ_CONTROL, 0, &fid, &oplock, NULL,
		@@ -604,7 +604,7 @@ static struct cifs_ntsd get_cifs_acl(u32 pacllen, struct inode *inode,

		rc = CIFSSMBGetCIFSACL(xid, cifs_sb->tcon, fid, &pntsd, pacllen);
		cFYI(1, ("GetCIFSACL rc = %d ACL len %d", rc, *pacllen));
		if (unlock_file == TRUE) /* find_readable_file increments ref count */
		if (unlock_file == true) /* find_readable_file increments ref count */
		atomic_dec(&open_file->wrtPending);
		else if (pfid == NULL) /* if opened above we have to close the handle */
		CIFSSMBClose(xid, cifs_sb->tcon, fid);
		@@ -619,7 +619,7 @@ static int set_cifs_acl(struct cifs_ntsd *pnntsd, __u32 acllen,
		struct inode inode, const char path)
		{
		struct cifsFileInfo *open_file;
		int unlock_file = FALSE;
		bool unlock_file = false;
		int xid;
		int rc = -EIO;
		__u16 fid;
		@@ -640,10 +640,10 @@ static int set_cifs_acl(struct cifs_ntsd *pnntsd, __u32 acllen,

		open_file = find_readable_file(CIFS_I(inode));
		if (open_file) {
		unlock_file = TRUE;
		unlock_file = true;
		fid = open_file->netfid;
		} else {
		int oplock = FALSE;
		int oplock = 0;
		/* open file */
		rc = CIFSSMBOpen(xid, cifs_sb->tcon, path, FILE_OPEN,
		WRITE_DAC, 0, &fid, &oplock, NULL,
		@@ -658,7 +658,7 @@ static int set_cifs_acl(struct cifs_ntsd *pnntsd, __u32 acllen,

		rc = CIFSSMBSetCIFSACL(xid, cifs_sb->tcon, fid, pnntsd, acllen);
		cFYI(DBG2, ("SetCIFSACL rc = %d", rc));
		if (unlock_file == TRUE)
		if (unlock_file)
		atomic_dec(&open_file->wrtPending);
		else
		CIFSSMBClose(xid, cifs_sb->tcon, fid);

fs/cifs/cifsfs.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -306,8 +306,8 @@ cifs_alloc_inode(struct super_block *sb)
		/* Until the file is open and we have gotten oplock
		info back from the server, can not assume caching of
		file data or metadata */
		cifs_inode->clientCanCacheRead = FALSE;
		cifs_inode->clientCanCacheAll = FALSE;
		cifs_inode->clientCanCacheRead = false;
		cifs_inode->clientCanCacheAll = false;
		cifs_inode->vfs_inode.i_blkbits = 14; /* 2*14 = CIFS_MAX_MSGSIZE /

		/* Can not set i_flags here - they get immediately overwritten
		@@ -940,7 +940,7 @@ static int cifs_oplock_thread(void *dummyarg)
		rc = CIFSSMBLock(0, pTcon, netfid,
		0 /* len / , 0 / offset */, 0,
		0, LOCKING_ANDX_OPLOCK_RELEASE,
		0 /* wait flag */);
		false /* wait flag */);
		cFYI(1, ("Oplock release rc = %d", rc));
		}
		} else

fs/cifs/cifsfs.h

+0 −8

Original line number	Diff line number	Diff line
		@@ -24,14 +24,6 @@

		#define ROOT_I 2

		#ifndef FALSE
		#define FALSE 0
		#endif

		#ifndef TRUE
		#define TRUE 1
		#endif

		extern struct file_system_type cifs_fs_type;
		extern const struct address_space_operations cifs_addr_ops;
		extern const struct address_space_operations cifs_addr_ops_smallbuf;

fs/cifs/cifsglob.h

+18 −26

Original line number	Diff line number	Diff line
		@@ -57,14 +57,6 @@

		#include "cifspdu.h"

		#ifndef FALSE
		#define FALSE 0
		#endif

		#ifndef TRUE
		#define TRUE 1
		#endif

		#ifndef XATTR_DOS_ATTRIB
		#define XATTR_DOS_ATTRIB "user.DOSATTRIB"
		#endif
		@@ -147,7 +139,7 @@ struct TCP_Server_Info {
		enum protocolEnum protocolType;
		char versionMajor;
		char versionMinor;
		unsigned svlocal:1; /* local server or remote */
		bool svlocal:1; /* local server or remote */
		atomic_t socketUseCount; /* number of open cifs sessions on socket */
		atomic_t inFlight; /* number of requests on the wire to server */
		#ifdef CONFIG_CIFS_STATS2
		@@ -286,10 +278,10 @@ struct cifsTconInfo {
		FILE_SYSTEM_DEVICE_INFO fsDevInfo;
		FILE_SYSTEM_ATTRIBUTE_INFO fsAttrInfo; /* ok if fs name truncated */
		FILE_SYSTEM_UNIX_INFO fsUnixInfo;
		unsigned ipc:1; /* set if connection to IPC$ eg for RPC/PIPES */
		unsigned retry:1;
		unsigned nocase:1;
		unsigned unix_ext:1; /* if off disable Linux extensions to CIFS protocol
		bool ipc:1; /* set if connection to IPC$ eg for RPC/PIPES */
		bool retry:1;
		bool nocase:1;
		bool unix_ext:1; /* if false disable Linux extensions to CIFS protocol
		for this mount even if server would support */
		/* BB add field for back pointer to sb struct(s)? */
		};
		@@ -317,10 +309,10 @@ struct cifs_search_info {
		char *srch_entries_start;
		char *presume_name;
		unsigned int resume_name_len;
		unsigned endOfSearch:1;
		unsigned emptyDir:1;
		unsigned unicode:1;
		unsigned smallBuf:1; /* so we know which buf_release function to call */
		bool endOfSearch:1;
		bool emptyDir:1;
		bool unicode:1;
		bool smallBuf:1; /* so we know which buf_release function to call */
		};

		struct cifsFileInfo {
		@@ -335,9 +327,9 @@ struct cifsFileInfo {
		struct inode pInode; / needed for oplock break */
		struct mutex lock_mutex;
		struct list_head llist; /* list of byte range locks we have. */
		unsigned closePend:1; /* file is marked to close */
		unsigned invalidHandle:1; /* file closed via session abend */
		unsigned messageMode:1; /* for pipes: message vs byte mode */
		bool closePend:1; /* file is marked to close */
		bool invalidHandle:1; /* file closed via session abend */
		bool messageMode:1; /* for pipes: message vs byte mode */
		atomic_t wrtPending; /* handle in use - defer close */
		struct semaphore fh_sem; /* prevents reopen race after dead ses*/
		char search_resume_name; / BB removeme BB */
		@@ -356,9 +348,9 @@ struct cifsInodeInfo {
		__u32 cifsAttrs; /* e.g. DOS archive bit, sparse, compressed, system */
		atomic_t inUse; /* num concurrent users (local openers cifs) of file*/
		unsigned long time; /* jiffies of last update/check of inode */
		unsigned clientCanCacheRead:1; /* read oplock */
		unsigned clientCanCacheAll:1; /* read and writebehind oplock */
		unsigned oplockPending:1;
		bool clientCanCacheRead:1; /* read oplock */
		bool clientCanCacheAll:1; /* read and writebehind oplock */
		bool oplockPending:1;
		struct inode vfs_inode;
		};

		@@ -426,9 +418,9 @@ struct mid_q_entry {
		struct smb_hdr resp_buf; / response buffer */
		int midState; /* wish this were enum but can not pass to wait_event */
		__u8 command; /* smb command code */
		unsigned largeBuf:1; /* if valid response, is pointer to large buf */
		unsigned multiRsp:1; /* multiple trans2 responses for one request */
		unsigned multiEnd:1; /* both received */
		bool largeBuf:1; /* if valid response, is pointer to large buf */
		bool multiRsp:1; /* multiple trans2 responses for one request */
		bool multiEnd:1; /* both received */
		};

		struct oplock_q_entry {