diff options
author | Steve French <sfrench@us.ibm.com> | 2007-06-05 14:30:44 -0400 |
---|---|---|
committer | Steve French <sfrench@us.ibm.com> | 2007-06-05 14:30:44 -0400 |
commit | 5fdae1f681426d23eadcb99566030781ba8c65c9 (patch) | |
tree | 14c07ff8e6ad2a9ece8349e4be3f95455d6fb3af /fs/cifs/ioctl.c | |
parent | e6985c7f6842fa040d058640e363140ad1730dc5 (diff) |
[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: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'fs/cifs/ioctl.c')
-rw-r--r-- | fs/cifs/ioctl.c | 29 |
1 files changed, 14 insertions, 15 deletions
diff --git a/fs/cifs/ioctl.c b/fs/cifs/ioctl.c index e34c7db00f6f..a414f1775ae0 100644 --- a/fs/cifs/ioctl.c +++ b/fs/cifs/ioctl.c | |||
@@ -30,7 +30,7 @@ | |||
30 | 30 | ||
31 | #define CIFS_IOC_CHECKUMOUNT _IO(0xCF, 2) | 31 | #define CIFS_IOC_CHECKUMOUNT _IO(0xCF, 2) |
32 | 32 | ||
33 | int cifs_ioctl (struct inode * inode, struct file * filep, | 33 | int cifs_ioctl (struct inode * inode, struct file * filep, |
34 | unsigned int command, unsigned long arg) | 34 | unsigned int command, unsigned long arg) |
35 | { | 35 | { |
36 | int rc = -ENOTTY; /* strange error - but the precedent */ | 36 | int rc = -ENOTTY; /* strange error - but the precedent */ |
@@ -47,13 +47,13 @@ int cifs_ioctl (struct inode * inode, struct file * filep, | |||
47 | 47 | ||
48 | xid = GetXid(); | 48 | xid = GetXid(); |
49 | 49 | ||
50 | cFYI(1,("ioctl file %p cmd %u arg %lu",filep,command,arg)); | 50 | cFYI(1, ("ioctl file %p cmd %u arg %lu", filep, command, arg)); |
51 | 51 | ||
52 | cifs_sb = CIFS_SB(inode->i_sb); | 52 | cifs_sb = CIFS_SB(inode->i_sb); |
53 | 53 | ||
54 | #ifdef CONFIG_CIFS_POSIX | 54 | #ifdef CONFIG_CIFS_POSIX |
55 | tcon = cifs_sb->tcon; | 55 | tcon = cifs_sb->tcon; |
56 | if(tcon) | 56 | if (tcon) |
57 | caps = le64_to_cpu(tcon->fsUnixInfo.Capability); | 57 | caps = le64_to_cpu(tcon->fsUnixInfo.Capability); |
58 | else { | 58 | else { |
59 | rc = -EIO; | 59 | rc = -EIO; |
@@ -62,24 +62,24 @@ int cifs_ioctl (struct inode * inode, struct file * filep, | |||
62 | } | 62 | } |
63 | #endif /* CONFIG_CIFS_POSIX */ | 63 | #endif /* CONFIG_CIFS_POSIX */ |
64 | 64 | ||
65 | switch(command) { | 65 | switch (command) { |
66 | case CIFS_IOC_CHECKUMOUNT: | 66 | case CIFS_IOC_CHECKUMOUNT: |
67 | cFYI(1,("User unmount attempted")); | 67 | cFYI(1, ("User unmount attempted")); |
68 | if(cifs_sb->mnt_uid == current->uid) | 68 | if (cifs_sb->mnt_uid == current->uid) |
69 | rc = 0; | 69 | rc = 0; |
70 | else { | 70 | else { |
71 | rc = -EACCES; | 71 | rc = -EACCES; |
72 | cFYI(1,("uids do not match")); | 72 | cFYI(1, ("uids do not match")); |
73 | } | 73 | } |
74 | break; | 74 | break; |
75 | #ifdef CONFIG_CIFS_POSIX | 75 | #ifdef CONFIG_CIFS_POSIX |
76 | case FS_IOC_GETFLAGS: | 76 | case FS_IOC_GETFLAGS: |
77 | if(CIFS_UNIX_EXTATTR_CAP & caps) { | 77 | if (CIFS_UNIX_EXTATTR_CAP & caps) { |
78 | if (pSMBFile == NULL) | 78 | if (pSMBFile == NULL) |
79 | break; | 79 | break; |
80 | rc = CIFSGetExtAttr(xid, tcon, pSMBFile->netfid, | 80 | rc = CIFSGetExtAttr(xid, tcon, pSMBFile->netfid, |
81 | &ExtAttrBits, &ExtAttrMask); | 81 | &ExtAttrBits, &ExtAttrMask); |
82 | if(rc == 0) | 82 | if (rc == 0) |
83 | rc = put_user(ExtAttrBits & | 83 | rc = put_user(ExtAttrBits & |
84 | FS_FL_USER_VISIBLE, | 84 | FS_FL_USER_VISIBLE, |
85 | (int __user *)arg); | 85 | (int __user *)arg); |
@@ -87,8 +87,8 @@ int cifs_ioctl (struct inode * inode, struct file * filep, | |||
87 | break; | 87 | break; |
88 | 88 | ||
89 | case FS_IOC_SETFLAGS: | 89 | case FS_IOC_SETFLAGS: |
90 | if(CIFS_UNIX_EXTATTR_CAP & caps) { | 90 | if (CIFS_UNIX_EXTATTR_CAP & caps) { |
91 | if(get_user(ExtAttrBits,(int __user *)arg)) { | 91 | if (get_user(ExtAttrBits, (int __user *)arg)) { |
92 | rc = -EFAULT; | 92 | rc = -EFAULT; |
93 | break; | 93 | break; |
94 | } | 94 | } |
@@ -96,16 +96,15 @@ int cifs_ioctl (struct inode * inode, struct file * filep, | |||
96 | break; | 96 | break; |
97 | /* rc= CIFSGetExtAttr(xid,tcon,pSMBFile->netfid, | 97 | /* rc= CIFSGetExtAttr(xid,tcon,pSMBFile->netfid, |
98 | extAttrBits, &ExtAttrMask);*/ | 98 | extAttrBits, &ExtAttrMask);*/ |
99 | |||
100 | } | 99 | } |
101 | cFYI(1,("set flags not implemented yet")); | 100 | cFYI(1, ("set flags not implemented yet")); |
102 | break; | 101 | break; |
103 | #endif /* CONFIG_CIFS_POSIX */ | 102 | #endif /* CONFIG_CIFS_POSIX */ |
104 | default: | 103 | default: |
105 | cFYI(1,("unsupported ioctl")); | 104 | cFYI(1, ("unsupported ioctl")); |
106 | break; | 105 | break; |
107 | } | 106 | } |
108 | 107 | ||
109 | FreeXid(xid); | 108 | FreeXid(xid); |
110 | return rc; | 109 | return rc; |
111 | } | 110 | } |