diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-08-21 19:28:26 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-08-21 19:28:26 -0400 |
commit | 1b18dc2beb31f588db1c75901b0112324c72124f (patch) | |
tree | 45050bf98417716cd934da104891ad6b403f67c1 /fs/sysfs/dir.c | |
parent | ab9bf4be4dd58f8ae1961180e008b7e3022f08b5 (diff) |
sysfs: fix up space coding style issues
This fixes up all of the space-related coding style issues for the sysfs
code.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs/sysfs/dir.c')
-rw-r--r-- | fs/sysfs/dir.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/fs/sysfs/dir.c b/fs/sysfs/dir.c index 32244cd157a7..e993133aa969 100644 --- a/fs/sysfs/dir.c +++ b/fs/sysfs/dir.c | |||
@@ -46,7 +46,7 @@ static unsigned int sysfs_name_hash(const void *ns, const char *name) | |||
46 | unsigned int len = strlen(name); | 46 | unsigned int len = strlen(name); |
47 | while (len--) | 47 | while (len--) |
48 | hash = partial_name_hash(*name++, hash); | 48 | hash = partial_name_hash(*name++, hash); |
49 | hash = ( end_name_hash(hash) ^ hash_ptr( (void *)ns, 31 ) ); | 49 | hash = (end_name_hash(hash) ^ hash_ptr((void *)ns, 31)); |
50 | hash &= 0x7fffffffU; | 50 | hash &= 0x7fffffffU; |
51 | /* Reserve hash numbers 0, 1 and INT_MAX for magic directory entries */ | 51 | /* Reserve hash numbers 0, 1 and INT_MAX for magic directory entries */ |
52 | if (hash < 1) | 52 | if (hash < 1) |
@@ -258,7 +258,7 @@ static void sysfs_free_ino(unsigned int ino) | |||
258 | spin_unlock(&sysfs_ino_lock); | 258 | spin_unlock(&sysfs_ino_lock); |
259 | } | 259 | } |
260 | 260 | ||
261 | void release_sysfs_dirent(struct sysfs_dirent * sd) | 261 | void release_sysfs_dirent(struct sysfs_dirent *sd) |
262 | { | 262 | { |
263 | struct sysfs_dirent *parent_sd; | 263 | struct sysfs_dirent *parent_sd; |
264 | 264 | ||
@@ -451,7 +451,7 @@ int __sysfs_add_one(struct sysfs_addrm_cxt *acxt, struct sysfs_dirent *sd) | |||
451 | 451 | ||
452 | if (!!sysfs_ns_type(acxt->parent_sd) != !!sd->s_ns) { | 452 | if (!!sysfs_ns_type(acxt->parent_sd) != !!sd->s_ns) { |
453 | WARN(1, KERN_WARNING "sysfs: ns %s in '%s' for '%s'\n", | 453 | WARN(1, KERN_WARNING "sysfs: ns %s in '%s' for '%s'\n", |
454 | sysfs_ns_type(acxt->parent_sd)? "required": "invalid", | 454 | sysfs_ns_type(acxt->parent_sd) ? "required" : "invalid", |
455 | acxt->parent_sd->s_name, sd->s_name); | 455 | acxt->parent_sd->s_name, sd->s_name); |
456 | return -EINVAL; | 456 | return -EINVAL; |
457 | } | 457 | } |
@@ -619,7 +619,7 @@ struct sysfs_dirent *sysfs_find_dirent(struct sysfs_dirent *parent_sd, | |||
619 | 619 | ||
620 | if (!!sysfs_ns_type(parent_sd) != !!ns) { | 620 | if (!!sysfs_ns_type(parent_sd) != !!ns) { |
621 | WARN(1, KERN_WARNING "sysfs: ns %s in '%s' for '%s'\n", | 621 | WARN(1, KERN_WARNING "sysfs: ns %s in '%s' for '%s'\n", |
622 | sysfs_ns_type(parent_sd)? "required": "invalid", | 622 | sysfs_ns_type(parent_sd) ? "required" : "invalid", |
623 | parent_sd->s_name, name); | 623 | parent_sd->s_name, name); |
624 | return NULL; | 624 | return NULL; |
625 | } | 625 | } |
@@ -674,7 +674,7 @@ static int create_dir(struct kobject *kobj, struct sysfs_dirent *parent_sd, | |||
674 | enum kobj_ns_type type, const void *ns, const char *name, | 674 | enum kobj_ns_type type, const void *ns, const char *name, |
675 | struct sysfs_dirent **p_sd) | 675 | struct sysfs_dirent **p_sd) |
676 | { | 676 | { |
677 | umode_t mode = S_IFDIR| S_IRWXU | S_IRUGO | S_IXUGO; | 677 | umode_t mode = S_IFDIR | S_IRWXU | S_IRUGO | S_IXUGO; |
678 | struct sysfs_addrm_cxt acxt; | 678 | struct sysfs_addrm_cxt acxt; |
679 | struct sysfs_dirent *sd; | 679 | struct sysfs_dirent *sd; |
680 | int rc; | 680 | int rc; |
@@ -737,7 +737,7 @@ static enum kobj_ns_type sysfs_read_ns_type(struct kobject *kobj) | |||
737 | * sysfs_create_dir - create a directory for an object. | 737 | * sysfs_create_dir - create a directory for an object. |
738 | * @kobj: object we're creating directory for. | 738 | * @kobj: object we're creating directory for. |
739 | */ | 739 | */ |
740 | int sysfs_create_dir(struct kobject * kobj) | 740 | int sysfs_create_dir(struct kobject *kobj) |
741 | { | 741 | { |
742 | enum kobj_ns_type type; | 742 | enum kobj_ns_type type; |
743 | struct sysfs_dirent *parent_sd, *sd; | 743 | struct sysfs_dirent *parent_sd, *sd; |
@@ -764,8 +764,8 @@ int sysfs_create_dir(struct kobject * kobj) | |||
764 | return error; | 764 | return error; |
765 | } | 765 | } |
766 | 766 | ||
767 | static struct dentry * sysfs_lookup(struct inode *dir, struct dentry *dentry, | 767 | static struct dentry *sysfs_lookup(struct inode *dir, struct dentry *dentry, |
768 | unsigned int flags) | 768 | unsigned int flags) |
769 | { | 769 | { |
770 | struct dentry *ret = NULL; | 770 | struct dentry *ret = NULL; |
771 | struct dentry *parent = dentry->d_parent; | 771 | struct dentry *parent = dentry->d_parent; |
@@ -857,7 +857,7 @@ static void __sysfs_remove_dir(struct sysfs_dirent *dir_sd) | |||
857 | * what used to be sysfs_rmdir() below, instead of calling separately. | 857 | * what used to be sysfs_rmdir() below, instead of calling separately. |
858 | */ | 858 | */ |
859 | 859 | ||
860 | void sysfs_remove_dir(struct kobject * kobj) | 860 | void sysfs_remove_dir(struct kobject *kobj) |
861 | { | 861 | { |
862 | struct sysfs_dirent *sd = kobj->sd; | 862 | struct sysfs_dirent *sd = kobj->sd; |
863 | 863 | ||
@@ -1001,7 +1001,7 @@ static struct sysfs_dirent *sysfs_dir_next_pos(const void *ns, | |||
1001 | static int sysfs_readdir(struct file *file, struct dir_context *ctx) | 1001 | static int sysfs_readdir(struct file *file, struct dir_context *ctx) |
1002 | { | 1002 | { |
1003 | struct dentry *dentry = file->f_path.dentry; | 1003 | struct dentry *dentry = file->f_path.dentry; |
1004 | struct sysfs_dirent * parent_sd = dentry->d_fsdata; | 1004 | struct sysfs_dirent *parent_sd = dentry->d_fsdata; |
1005 | struct sysfs_dirent *pos = file->private_data; | 1005 | struct sysfs_dirent *pos = file->private_data; |
1006 | enum kobj_ns_type type; | 1006 | enum kobj_ns_type type; |
1007 | const void *ns; | 1007 | const void *ns; |