diff options
| author | Denis Cheng <crquan@gmail.com> | 2008-01-29 13:50:16 +0800 |
|---|---|---|
| committer | David Teigland <teigland@redhat.com> | 2008-01-30 11:04:43 -0600 |
| commit | 0fe410d3f3b1496190f37ef74cd089229cef97fa (patch) | |
| tree | b2f931b89348c45be3f8476f2b005464817e335a /fs/dlm/user.c | |
| parent | dbcfc34733d1ae37e7a78c9e4e5325451223a5eb (diff) | |
| download | lwn-0fe410d3f3b1496190f37ef74cd089229cef97fa.tar.gz lwn-0fe410d3f3b1496190f37ef74cd089229cef97fa.zip | |
dlm: static initialization improvements
also change name_prefix from char pointer to char array.
Signed-off-by: Denis Cheng <crquan@gmail.com>
Signed-off-by: David Teigland <teigland@redhat.com>
Diffstat (limited to 'fs/dlm/user.c')
| -rw-r--r-- | fs/dlm/user.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/fs/dlm/user.c b/fs/dlm/user.c index 1acb4c5813cd..7cbc6826239b 100644 --- a/fs/dlm/user.c +++ b/fs/dlm/user.c @@ -24,8 +24,7 @@ #include "lvb_table.h" #include "user.h" -static const char *name_prefix="dlm"; -static struct miscdevice ctl_device; +static const char name_prefix[] = "dlm"; static const struct file_operations device_fops; #ifdef CONFIG_COMPAT @@ -902,14 +901,16 @@ static const struct file_operations ctl_device_fops = { .owner = THIS_MODULE, }; +static struct miscdevice ctl_device = { + .name = "dlm-control", + .fops = &ctl_device_fops, + .minor = MISC_DYNAMIC_MINOR, +}; + int dlm_user_init(void) { int error; - ctl_device.name = "dlm-control"; - ctl_device.fops = &ctl_device_fops; - ctl_device.minor = MISC_DYNAMIC_MINOR; - error = misc_register(&ctl_device); if (error) log_print("misc_register failed for control device"); |