diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-08 22:58:14 +0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-08 22:58:14 +0400 |
commit | 9ddd3a31aedcdb55d5509b595c04b187041c8adb (patch) | |
tree | 210582aade8b4342b2abfbc3682dd2014456d23b /fs/cifs/cifsfs.c | |
parent | d620a7cf05d4f12f5bbb1060d766e8139ab31458 (diff) | |
parent | f05337c6ac48d19d354e0640a8eb8fc884f82bcc (diff) | |
download | linux-9ddd3a31aedcdb55d5509b595c04b187041c8adb.tar.xz |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6:
not overwriting file_lock structure after GET_LK
cifs: Fix a kernel BUG with remote OS/2 server (try #3)
[CIFS] initialize nbytes at the beginning of CIFSSMBWrite()
[CIFS] Add mmap for direct, nobrl cifs mount types
Diffstat (limited to 'fs/cifs/cifsfs.c')
-rw-r--r-- | fs/cifs/cifsfs.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c index 5183bc2a1916..ded66be6597c 100644 --- a/fs/cifs/cifsfs.c +++ b/fs/cifs/cifsfs.c @@ -808,6 +808,7 @@ const struct file_operations cifs_file_direct_nobrl_ops = { .release = cifs_close, .fsync = cifs_fsync, .flush = cifs_flush, + .mmap = cifs_file_mmap, .splice_read = generic_file_splice_read, #ifdef CONFIG_CIFS_POSIX .unlocked_ioctl = cifs_ioctl, |