Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5fdae1f6 authored by Steve French's avatar Steve French
Browse files

[CIFS] whitespace cleanup 



Various coding style problems found by running fs/cifs
against the new checkpatch.pl script.  Since there
were too many to fit in one patch.  Updated the first
four files.

Signed-off-by: default avatarSteve French <sfrench@us.ibm.com>
parent e6985c7f

fs/cifs/dir.c

+87 −85
Original line number Diff line number Diff line
@@ -34,7 +34,8 @@ 
static void

renew_parental_timestamps(struct dentry *direntry)

{

	/* BB check if there is a way to get the kernel to do this or if we really need this */

	/* BB check if there is a way to get the kernel to do this or if we

	   really need this */

	do {

		direntry->d_time = jiffies;

		direntry = direntry->d_parent;
@@ -175,7 +176,8 @@ cifs_create(struct inode *inode, struct dentry *direntry, int mode, 
		}

	}



	/* BB add processing to set equivalent of mode - e.g. via CreateX with ACLs */

	/* BB add processing to set equivalent of mode - e.g. via CreateX with

	   ACLs */

	if (oplockEnabled)

		oplock = REQ_OPLOCK;
@@ -225,9 +227,11 @@ cifs_create(struct inode *inode, struct dentry *direntry, int mode, 
						CIFS_MOUNT_MAP_SPECIAL_CHR);

			}

		else {

			/* BB implement mode setting via Windows security descriptors */

			/* eg CIFSSMBWinSetPerms(xid,pTcon,full_path,mode,-1,-1,local_nls);*/

			/* could set r/o dos attribute if mode & 0222 == 0 */

			/* BB implement mode setting via Windows security

			   descriptors e.g. */

			/* CIFSSMBWinSetPerms(xid,pTcon,path,mode,-1,-1,nls);*/



			/* Could set r/o dos attribute if mode & 0222 == 0 */

		}



	/* BB server might mask mode so we have to query for Unix case*/
@@ -334,7 +338,8 @@ int cifs_mknod(struct inode *inode, struct dentry *direntry, int mode, 
	else if (pTcon->ses->capabilities & CAP_UNIX) {

		if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_SET_UID) {

			rc = CIFSSMBUnixSetPerms(xid, pTcon, full_path,

				mode,(__u64)current->fsuid,(__u64)current->fsgid,

				mode, (__u64)current->fsuid,

				(__u64)current->fsgid,

				device_number, cifs_sb->local_nls,

				cifs_sb->mnt_cifs_flags &

					CIFS_MOUNT_MAP_SPECIAL_CHR);
@@ -385,8 +390,7 @@ int cifs_mknod(struct inode *inode, struct dentry *direntry, int mode, 


			/* BB FIXME - add handling for backlevel servers

			   which need legacy open and check for all

			   calls to SMBOpen for fallback to 

			   SMBLeagcyOpen */

			   calls to SMBOpen for fallback to SMBLeagcyOpen */

			if (!rc) {

				/* BB Do not bother to decode buf since no

				   local inode yet to put timestamps in,
@@ -432,7 +436,8 @@ int cifs_mknod(struct inode *inode, struct dentry *direntry, int mode, 




struct dentry *

cifs_lookup(struct inode *parent_dir_inode, struct dentry *direntry, struct nameidata *nd)

cifs_lookup(struct inode *parent_dir_inode, struct dentry *direntry,

	    struct nameidata *nd)

{

	int xid;

	int rc = 0; /* to get around spurious gcc warning, set to zero here */
@@ -447,8 +452,6 @@ cifs_lookup(struct inode *parent_dir_inode, struct dentry *direntry, struct name 
	     (" parent inode = 0x%p name is: %s and dentry = 0x%p",

	      parent_dir_inode, direntry->d_name.name, direntry));



	/* BB Add check of incoming data - e.g. frame not longer than maximum SMB - let server check the namelen BB */



	/* check whether path exists */



	cifs_sb = CIFS_SB(parent_dir_inode->i_sb);
@@ -560,7 +563,6 @@ cifs_d_revalidate(struct dentry *direntry, struct nameidata *nd) 
struct dentry_operations cifs_dentry_ops = {

	.d_revalidate = cifs_d_revalidate,

/* d_delete:       cifs_d_delete,      */ /* not needed except for debugging */

	/* no need for d_hash, d_compare, d_release, d_iput ... yet. BB confirm this BB */

};



static int cifs_ci_hash(struct dentry *dentry, struct qstr *q)

fs/cifs/fcntl.c

+22 −24
Original line number Diff line number Diff line
@@ -63,7 +63,6 @@ static __u32 convert_to_cifs_notify_flags(unsigned long fcntl_notify_flags) 
		cifs_ntfy_flags |= ;

	} */ /* BB fixme - not sure how to handle this with CIFS yet */





	return cifs_ntfy_flags;

}
@@ -78,7 +77,6 @@ int cifs_dir_notify(struct file * file, unsigned long arg) 
	__u32 filter = FILE_NOTIFY_CHANGE_NAME | FILE_NOTIFY_CHANGE_ATTRIBUTES;

	__u16 netfid;





	if (experimEnabled == 0)

		return 0;

fs/cifs/ioctl.c

+14 −15
Original line number Diff line number Diff line
@@ -96,7 +96,6 @@ int cifs_ioctl (struct inode * inode, struct file * filep, 
					break;

				/* rc= CIFSGetExtAttr(xid,tcon,pSMBFile->netfid,

					extAttrBits, &ExtAttrMask);*/

				

			}

			cFYI(1, ("set flags not implemented yet"));

			break;

fs/cifs/rfc1002pdu.h

+1 −1

File changed.

Contains only whitespace changes.