diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-09 11:26:44 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-09 11:26:44 -0700 |
| commit | c75e24752c0c87938a5955d9056dfb83e8352206 (patch) | |
| tree | a96cec700059896e6b6567be324de63597b3b627 /fs/ext3 | |
| parent | d2b4a646717153a1a180b64d4a8464054dbd700e (diff) | |
| parent | 4fbeb19d53cc3ef2da4bd1fd89a5dc9ac04add3a (diff) | |
| download | op-kernel-dev-c75e24752c0c87938a5955d9056dfb83e8352206.zip op-kernel-dev-c75e24752c0c87938a5955d9056dfb83e8352206.tar.gz | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull third set of VFS updates from Al Viro:
"Misc stuff all over the place. There will be one more pile in a
couple of days"
This is an "evil merge" that also uses the new d_count helper in
fs/configfs/dir.c, missed by commit 84d08fa888e7 ("helper for reading
->d_count")
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
ncpfs: fix error return code in ncp_parse_options()
locks: move file_lock_list to a set of percpu hlist_heads and convert file_lock_lock to an lglock
seq_file: add seq_list_*_percpu helpers
f2fs: fix readdir incorrectness
mode_t whack-a-mole...
lustre: kill the pointless wrapper
helper for reading ->d_count
Diffstat (limited to 'fs/ext3')
0 files changed, 0 insertions, 0 deletions
