Skip to contentSkip to conversation

Whitespace Coding style fixes.

PATCH In review Justin P. Mattock 5 participants 10 messages Apr 21, 2010 – Apr 23, 2010

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Whitespace Coding style fixes.

Whitespace Coding style fixes.

---
 security/commoncap.c       |    4 +-
 security/device_cgroup.c   |    2 +-
 security/keys/key.c        |    2 +-
 security/keys/keyctl.c     |   58 ++++++++++++++++++++++----------------------
 security/keys/keyring.c    |   20 +++++++-------
 security/keys/permission.c |    2 +-
 security/keys/proc.c       |    2 +-
 7 files changed, 45 insertions(+), 45 deletions(-)
security/commoncap.c +2 -2
index 6166973..a70b682 100644
@@ -570,7 +570,7 @@ int cap_inode_setxattr(struct dentry *dentry, const char *name,
 	}
 
 	if (!strncmp(name, XATTR_SECURITY_PREFIX,
-		     sizeof(XATTR_SECURITY_PREFIX) - 1)  &&
+		     sizeof(XATTR_SECURITY_PREFIX) - 1) &&
 	    !capable(CAP_SYS_ADMIN))
 		return -EPERM;
 	return 0;
@@ -596,7 +596,7 @@ int cap_inode_removexattr(struct dentry *dentry, const char *name)
 	}
 
 	if (!strncmp(name, XATTR_SECURITY_PREFIX,
-		     sizeof(XATTR_SECURITY_PREFIX) - 1)  &&
+		     sizeof(XATTR_SECURITY_PREFIX) - 1) &&
 	    !capable(CAP_SYS_ADMIN))
 		return -EPERM;
 	return 0;
security/device_cgroup.c +1 -1
index f77c604..8d9c48f 100644
@@ -470,7 +470,7 @@ struct cgroup_subsys devices_subsys = {
 	.name = "devices",
 	.can_attach = devcgroup_can_attach,
 	.create = devcgroup_create,
-	.destroy  = devcgroup_destroy,
+	.destroy = devcgroup_destroy,
 	.populate = devcgroup_populate,
 	.subsys_id = devices_subsys_id,
 };
security/keys/key.c +1 -1
index e50d264..c70da6f 100644
@@ -355,7 +355,7 @@ EXPORT_SYMBOL(key_alloc);
  */
 int key_payload_reserve(struct key *key, size_t datalen)
 {
-	int delta = (int) datalen - key->datalen;
+	int delta = (int)datalen - key->datalen;
 	int ret = 0;
 
 	key_check(key);
security/keys/keyctl.c +29 -29

157 lines not on this page · raw message

security/keys/keyring.c +10 -10
index e814d21..ca5316f 100644
@@ -39,7 +39,7 @@ static inline unsigned keyring_hash(const char *desc)
 	unsigned bucket = 0;
 
 	for (; *desc; desc++)
-		bucket += (unsigned char) *desc;
+		bucket += (unsigned char)*desc;
 
 	return bucket & (KEYRING_NAME_HASH_SIZE - 1);
 }
@@ -237,7 +237,7 @@ static long keyring_read(const struct key *keyring,
 		ret = qty;
 	}
 
- error:
+error:
 	return ret;
 
 } /* end keyring_read() */
@@ -508,7 +508,7 @@ key_ref_t __keyring_search_one(key_ref_t keyring_ref,
 	rcu_read_unlock();
 	return ERR_PTR(-ENOKEY);
 
- found:
+found:
 	atomic_inc(&key->usage);
 	rcu_read_unlock();
 	return make_key_ref(key, possessed);
@@ -565,7 +565,7 @@ struct key *find_keyring_by_name(const char *name, bool skip_perm_check)
 	read_unlock(&keyring_name_lock);
 	keyring = ERR_PTR(-ENOKEY);
 
- error:
+error:
 	return keyring;
 
 } /* end find_keyring_by_name() */
@@ -598,7 +598,7 @@ static int keyring_detect_cycle(struct key *A, struct key *B)
 	sp = 0;
 
 	/* start processing a new keyring */
- descend:
+descend:
 	if (test_bit(KEY_FLAG_REVOKED, &subtree->flags))
 		goto not_this_keyring;
 
@@ -607,7 +607,7 @@ static int keyring_detect_cycle(struct key *A, struct key *B)
 		goto not_this_keyring;
 	kix = 0;
 
- ascend:
+ascend:
 	/* iterate through the remaining keys in this keyring */
 	for (; kix < keylist->nkeys; kix++) {
 		key = keylist->keys[kix];
@@ -633,7 +633,7 @@ static int keyring_detect_cycle(struct key *A, struct key *B)
 
 	/* the keyring we're looking at was disqualified or didn't contain a
 	 * matching key */
- not_this_keyring:
+not_this_keyring:
 	if (sp > 0) {
 		/* resume the checking of a keyring higher up in the tree */
 		sp--;
@@ -644,15 +644,15 @@ static int keyring_detect_cycle(struct key *A, struct key *B)
 
 	ret = 0; /* no cycles detected */
 
- error:
+error:
 	rcu_read_unlock();
 	return ret;
 
- too_deep:
+too_deep:
 	ret = -ELOOP;
 	goto error;
 
- cycle_detected:
+cycle_detected:
 	ret = -EDEADLK;
 	goto error;
 
security/keys/permission.c +1 -1
index 0ed802c..2864550 100644
@@ -109,7 +109,7 @@ int key_validate(struct key *key)
 		}
 	}
 
- error:
+error:
 	return ret;
 
 } /* end key_validate() */
security/keys/proc.c +1 -1
index 706d63f..068b66e 100644
@@ -306,7 +306,7 @@ static void *proc_key_users_start(struct seq_file *p, loff_t *_pos)
 static void *proc_key_users_next(struct seq_file *p, void *v, loff_t *_pos)
 {
 	(*_pos)++;
-	return key_user_next((struct rb_node *) v);
+	return key_user_next((struct rb_node *)v);
 }
 
 static void proc_key_users_stop(struct seq_file *p, void *v)
Signature · 1 line
1.6.5.GIT
#1 lore raw

Don't send this.
You screw up git-blame.

Quoted 1 line · Justin P. Mattock

Whitespace Coding style fixes.

#2 lore raw
Quoted 3 lines · Alexey Dobriyan

Don't send this.
You screw up git-blame.

I'm not sure how git-blame works.
how does this patch screw it up?

Justin P. Mattock

#3 lore raw
Quoted 3 lines · Justin P. Mattock
Quoted 1 line · Alexey Dobriyan

You screw up git-blame.

how does this patch screw it up?

Alexey just doesn't like whitespace patches.

Whitespace patches don't really "screw up" git blame.

git blame displays the current version of a file with line-by-line commits and the date each line was last modified.

So whitespace changes make it harder to find which patch introduced the last logical change for a particular line.

A more interactive git blame with history backtracking might help keep Alexey happier but who knows for sure...

#4 lore raw
Quoted 7 lines · On Wed, 21 Apr 2010 00:34:41 -0700 Joe Perches <[email protected]> wrote:
Quoted 3 lines · Justin P. Mattock
Quoted 1 line · Alexey Dobriyan

You screw up git-blame.

how does this patch screw it up?

Alexey just doesn't like whitespace patches.

Quoted 8 lines

Whitespace patches don't really "screw up" git blame.

git blame displays the current version of a file
with line-by-line commits and the date each line
was last modified.

So whitespace changes make it harder to find which patch introduced the last logical change for a particular line.

git blame -w

#5 lore raw
In reply to Joe Perches
Quoted 13 lines · Joe Perches
Quoted 3 lines · Justin P. Mattock
Quoted 1 line · Alexey Dobriyan

You screw up git-blame.

how does this patch screw it up?

Alexey just doesn't like whitespace patches.

Whitespace patches don't really "screw up" git blame.

git blame displays the current version of a file with line-by-line commits and the date each line was last modified.

Quoted 7 lines

So whitespace changes make it harder to find which patch introduced the last logical change for a particular line.

A more interactive git blame with history backtracking might help keep Alexey happier but who knows for sure...

ahh.. so after adding this patch,
and committing it in my branch the doing git blame security/commoncap.c
only shows something from James Morris instead of what my change had brought.

Alright I can see why it screws things up.. I'll not (L)indent the whole tree then...

Justin P. Mattock

#7 lore raw
Quoted 4 lines · James Morris
Quoted 2 lines · Justin P. Mattock

Whitespace Coding style fixes.

Quoted 9 lines
Quoted 1 line

Applied to
git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6#next

with fixes to the Subject: line (needed a subsystem field and fixed capitalization).

Cool thank you vary much..

side note: what/where is the git web interface So I can see how you changed the patch(so I know the next). I'm looking here:
http://git.kernel.org/?p=linux/kernel/git/jmorris/security-testing-2.6.git;a=summary

is this correct?

Justin P. Mattock

#9 lore raw
Quoted 7 lines · James Morris
Quoted 5 lines · Justin P. Mattock

side note: what/where is the git web interface So I can see how you changed the patch(so I know the next). I'm looking here:
http://git.kernel.org/?p=linux/kernel/git/jmorris/security-testing-2.6.git;a=summary

Quoted 5 lines
Quoted 1 line

is this correct?

Yeah, there should be a 'next' link to click on somewhere to get the right branch.

duh.. I didn't scroll all the way down the page.. I see it now.
as for the subject line..
o.k...
my mistake(I should of know to do so)
thanks for fixing this for me.

as for going through a doing this If I see more obvious fixes is it cool to just add you unto the CC
or should I not even bother since git-blame gets funky?!

Justin P. Mattock