projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
[linux-2.6-block.git]
/
fs
/
ubifs
/
dir.c
diff --git
a/fs/ubifs/dir.c
b/fs/ubifs/dir.c
index 4d07d15647808c8a238fe6a49be85d2d12288803..4b86d3a738e1807c667fb6736f1deaa28a93d429 100644
(file)
--- a/
fs/ubifs/dir.c
+++ b/
fs/ubifs/dir.c
@@
-1195,7
+1195,7
@@
const struct file_operations ubifs_dir_operations = {
.llseek = generic_file_llseek,
.release = ubifs_dir_release,
.read = generic_read_dir,
- .iterate
= ubifs_readdir,
+ .iterate
_shared
= ubifs_readdir,
.fsync = ubifs_fsync,
.unlocked_ioctl = ubifs_ioctl,
#ifdef CONFIG_COMPAT