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

Commit fb8c4b14 authored by Steve French's avatar Steve French
Browse files

[CIFS] whitespace cleanup 



More than halfway there

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

fs/cifs/connect.c

+199 −199
Original line number Diff line number Diff line
@@ -186,11 +186,11 @@ cifs_reconnect(struct TCP_Server_Info *server) 
	spin_unlock(&GlobalMid_Lock);

	up(&server->tcpSem);



	while ( (!kthread_should_stop()) && (server->tcpStatus != CifsGood))

	{

	while ( (!kthread_should_stop()) && (server->tcpStatus != CifsGood)) {

		try_to_freeze();

		if (server->protocolType == IPV6) {

			rc = ipv6_connect(&server->addr.sockAddr6,&server->ssocket);

			rc = ipv6_connect(&server->addr.sockAddr6,

					  &server->ssocket);

		} else {

			rc = ipv4_connect(&server->addr.sockAddr,

					&server->ssocket,

fs/cifs/export.c

+12 −12
Original line number Diff line number Diff line
@@ -40,8 +40,8 @@ static struct dentry *cifs_get_parent(struct dentry *dentry) 
 

struct export_operations cifs_export_ops = {

	.get_parent = cifs_get_parent,

/*	Following five export operations are unneeded so far and can default */ 	

/* 	.get_dentry =

/*	Following five export operations are unneeded so far and can default:

	.get_dentry =

	.get_name =

	.find_exported_dentry =

	.decode_fh =

fs/cifs/file.c

+125 −120
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
 *

 *   vfs operations that deal with files

 *

 *   Copyright (C) International Business Machines  Corp., 2002,2003

 *   Copyright (C) International Business Machines  Corp., 2002,2007

 *   Author(s): Steve French (sfrench@us.ibm.com)

 *              Jeremy Allison (jra@samba.org)

 *
@@ -554,7 +554,8 @@ int cifs_closedir(struct inode *inode, struct file *file) 


	if (pCFileStruct) {

		struct cifsTconInfo *pTcon;

		struct cifs_sb_info *cifs_sb = CIFS_SB(file->f_path.dentry->d_sb);

		struct cifs_sb_info *cifs_sb =

			CIFS_SB(file->f_path.dentry->d_sb);



		pTcon = cifs_sb->tcon;
@@ -594,7 +595,8 @@ int cifs_closedir(struct inode *inode, struct file *file) 
static int store_file_lock(struct cifsFileInfo *fid, __u64 len,

				__u64 offset, __u8 lockType)

{

	struct cifsLockInfo *li = kmalloc(sizeof(struct cifsLockInfo), GFP_KERNEL);

	struct cifsLockInfo *li =

		kmalloc(sizeof(struct cifsLockInfo), GFP_KERNEL);

	if (li == NULL)

		return -ENOMEM;

	li->offset = offset;
@@ -741,10 +743,12 @@ int cifs_lock(struct file *file, int cmd, struct file_lock *pfLock) 
				      length, pfLock,

				      posix_lock_type, wait_flag);

	} else {

		struct cifsFileInfo *fid = (struct cifsFileInfo *)file->private_data;

		struct cifsFileInfo *fid =

			(struct cifsFileInfo *)file->private_data;



		if (numLock) {

			rc = CIFSSMBLock(xid, pTcon, netfid, length, pfLock->fl_start,

			rc = CIFSSMBLock(xid, pTcon, netfid, length,

					pfLock->fl_start,

					0, numLock, lockType, wait_flag);



			if (rc == 0) {
@@ -763,7 +767,8 @@ int cifs_lock(struct file *file, int cmd, struct file_lock *pfLock) 
			list_for_each_entry_safe(li, tmp, &fid->llist, llist) {

				if (pfLock->fl_start <= li->offset &&

						length >= li->length) {

					stored_rc = CIFSSMBLock(xid, pTcon, netfid,

					stored_rc = CIFSSMBLock(xid, pTcon,

							netfid,

							li->length, li->offset,

							1, 0, li->type, FALSE);

					if (stored_rc)

fs/cifs/inode.c

+131 −128
Original line number Diff line number Diff line
@@ -471,7 +471,8 @@ int cifs_get_inode_info(struct inode **pinode, 
			/* new inode, can safely set these fields */

			inode->i_mode = cifs_sb->mnt_file_mode;

		else /* since we set the inode type below we need to mask off

		     to avoid strange results if type changes and both get orred in */ 

		     to avoid strange results if type changes and both

		     get orred in */

			inode->i_mode &= ~S_IFMT;

/*		if (attr & ATTR_REPARSE)  */

		/* We no longer handle these as symlinks because we could not
@@ -849,8 +850,9 @@ static void posix_fill_in_inode(struct inode *tmp_inode, 
			tmp_inode->i_data.a_ops = &cifs_addr_ops;



		if (isNewInode)

			return; /* No sense invalidating pages for new inode since we

					   have not started caching readahead file data yet */

			return; /* No sense invalidating pages for new inode

				   since we we have not started caching

				   readahead file data yet */



		if (timespec_equal(&tmp_inode->i_mtime, &local_mtime) &&

			(local_size == tmp_inode->i_size)) {
@@ -920,7 +922,8 @@ int cifs_mkdir(struct inode *inode, struct dentry *direntry, int mode) 
			int obj_type;

			if (pInfo->Type == -1) /* no return info - go query */

				goto mkdir_get_info;

/*BB check (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_SET_UID ) to see if need to set uid/gid */

/*BB check (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_SET_UID ) to see if need

	to set uid/gid */

			inc_nlink(inode);

			if (pTcon->nocase)

				direntry->d_op = &cifs_ci_dentry_ops;

fs/cifs/ioctl.c

+2 −2
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
 *

 *   vfs operations that deal with io control

 *

 *   Copyright (C) International Business Machines  Corp., 2005

 *   Copyright (C) International Business Machines  Corp., 2005,2007

 *   Author(s): Steve French (sfrench@us.ibm.com)

 *

 *   This library is free software; you can redistribute it and/or modify