diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-17 11:00:09 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-17 11:00:09 -0800 |
| commit | 235646a486d10891bd86af28d8eac75d9f22bd2d (patch) | |
| tree | 72308e6d2d7c936d00907689a2749715873d5f1b /drivers | |
| parent | af575e2d2e09517a8190f1b425453cc3e0102f6c (diff) | |
| parent | ecf5632dd189ab4c366cef853d6e5fe7adfe52e5 (diff) | |
| download | linux-3.10-235646a486d10891bd86af28d8eac75d9f22bd2d.tar.gz linux-3.10-235646a486d10891bd86af28d8eac75d9f22bd2d.tar.bz2 linux-3.10-235646a486d10891bd86af28d8eac75d9f22bd2d.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6:
fs: fix address space warnings in ioctl_fiemap()
aio: check return value of create_workqueue()
hpfs_setattr error case avoids unlock_kernel
compat: copy missing fields in compat_statfs64 to user
compat: update comment of compat statfs syscalls
compat: remove unnecessary assignment in compat_rw_copy_check_uvector()
fs: FS_POSIX_ACL does not depend on BLOCK
fs: Remove unlikely() from fget_light()
fs: Remove unlikely() from fput_light()
fallocate should be a file operation
make the feature checks in ->fallocate future proof
staging: smbfs building fix
tidy up around finish_automount()
don't drop newmnt on error in do_add_mount()
Take the completion of automount into new helper
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/staging/smbfs/dir.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/smbfs/dir.c b/drivers/staging/smbfs/dir.c index 87a3a9bd584..f204d33910e 100644 --- a/drivers/staging/smbfs/dir.c +++ b/drivers/staging/smbfs/dir.c @@ -283,7 +283,7 @@ static int smb_compare_dentry(const struct dentry *, unsigned int, const char *, const struct qstr *); static int smb_delete_dentry(const struct dentry *); -static const struct dentry_operations smbfs_dentry_operations = +const struct dentry_operations smbfs_dentry_operations = { .d_revalidate = smb_lookup_validate, .d_hash = smb_hash_dentry, @@ -291,7 +291,7 @@ static const struct dentry_operations smbfs_dentry_operations = .d_delete = smb_delete_dentry, }; -static const struct dentry_operations smbfs_dentry_operations_case = +const struct dentry_operations smbfs_dentry_operations_case = { .d_revalidate = smb_lookup_validate, .d_delete = smb_delete_dentry, |