diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-02 16:53:07 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-02 16:53:07 -0400 |
| commit | be2e88011bd800222bfd7b477c727966f93186a9 (patch) | |
| tree | 089ab03feb7cfde6a1b548e9de70ee35860d393d /fs/ocfs2/stack_user.c | |
| parent | d626e3bf728c47746f2129aa00c775d4e8c2a73b (diff) | |
| parent | 4ba1c5bfd2e5a6c9528eb7777b66c297e70f61ca (diff) | |
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2:
ocfs2: Use GFP_NOFS in kmalloc during localalloc window move
ocfs2: Allow uid/gid/perm changes of symlinks
ocfs2/dlm: dlmdebug.c: make 2 functions static
ocfs2: make struct o2cb_stack_ops static
ocfs2: make struct ocfs2_control_device static
ocfs2: Correct merge of 52f7c21 (Move /sys/o2cb to /sys/fs/o2cb)
Diffstat (limited to 'fs/ocfs2/stack_user.c')
| -rw-r--r-- | fs/ocfs2/stack_user.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ocfs2/stack_user.c b/fs/ocfs2/stack_user.c index 7428663f9cbb..b503772cd0ec 100644 --- a/fs/ocfs2/stack_user.c +++ b/fs/ocfs2/stack_user.c | |||
| @@ -635,7 +635,7 @@ static const struct file_operations ocfs2_control_fops = { | |||
| 635 | .owner = THIS_MODULE, | 635 | .owner = THIS_MODULE, |
| 636 | }; | 636 | }; |
| 637 | 637 | ||
| 638 | struct miscdevice ocfs2_control_device = { | 638 | static struct miscdevice ocfs2_control_device = { |
| 639 | .minor = MISC_DYNAMIC_MINOR, | 639 | .minor = MISC_DYNAMIC_MINOR, |
| 640 | .name = "ocfs2_control", | 640 | .name = "ocfs2_control", |
| 641 | .fops = &ocfs2_control_fops, | 641 | .fops = &ocfs2_control_fops, |