diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-03 14:33:09 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-03 14:33:09 -0700 |
commit | 54161df1fb1469d66bce3a3b14d8281adbb69263 (patch) | |
tree | b5f0f8741db382daf09dd236e9e678d60422dc48 /fs/btrfs/tree-defrag.c | |
parent | be82ae0238b0453afcf4a76f0512b7dde34ba500 (diff) | |
parent | cb76d5e25008b76fb8e348c861d32659430ac3fa (diff) | |
download | blackbird-op-linux-54161df1fb1469d66bce3a3b14d8281adbb69263.tar.gz blackbird-op-linux-54161df1fb1469d66bce3a3b14d8281adbb69263.zip |
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: (29 commits)
cifs: fsc should not default to "on"
[CIFS] remove redundant path walking in dfs_do_refmount
cifs: ignore the "mand", "nomand" and "_netdev" mount options
cifs: map NT_STATUS_ERROR_WRITE_PROTECTED to -EROFS
cifs: don't allow cifs_iget to match inodes of the wrong type
[CIFS] relinquish fscache cookie before freeing CIFSTconInfo
cifs: add separate cred_uid field to sesInfo
fs: cifs: check kmalloc() result
[CIFS] Missing ifdef
[CIFS] Missing line from previous commit
[CIFS] Fix build break when CONFIG_CIFS_FSCACHE disabled
cifs: add mount option to enable local caching
cifs: read pages from FS-Cache
cifs: store pages into local cache
cifs: FS-Cache page management
cifs: define inode-level cache object and register them
cifs: define superblock-level cache index objects and register them
cifs: remove unused cifsUidInfo struct
cifs: clean up cifs_find_smb_ses (try #2)
cifs: match secType when searching for existing tcp session
...
Diffstat (limited to 'fs/btrfs/tree-defrag.c')
0 files changed, 0 insertions, 0 deletions