diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2014-10-11 08:00:16 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-10-11 08:00:16 -0400 |
| commit | 41e46ac0fae9583d81e6b148329fec627d192181 (patch) | |
| tree | 87b666b06deaf1d4d7db7e81cf66c6d6c84952a2 /fs/ecryptfs/keystore.c | |
| parent | Merge tag 'vfio-v3.18-rc1' of git://github.com/awilliam/linux-vfio (diff) | |
| parent | GFS2: use _RET_IP_ instead of (unsigned long)__builtin_return_address(0) (diff) | |
| download | linux-dev-41e46ac0fae9583d81e6b148329fec627d192181.tar.xz linux-dev-41e46ac0fae9583d81e6b148329fec627d192181.zip | |
Merge tag 'gfs2-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-nmw
Pull gfs2 updates from Steven Whitehouse:
"This time we have a couple of bug fixes, one relating to bad i_goal
values which are now ignored (i_goal is basically a hint so it is safe
to so this) and another relating to the saving of the dirent location
during rename.
There is one performance improvement, which is an optimisation in
rgblk_free so that multiple block deallocations will now be more
efficient, and one clean up patch to use _RET_IP_ rather than writing
it out longhand"
* tag 'gfs2-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-nmw:
GFS2: use _RET_IP_ instead of (unsigned long)__builtin_return_address(0)
GFS2: Use gfs2_rbm_incr in rgblk_free
GFS2: Make rename not save dirent location
GFS2: fix bad inode i_goal values during block allocation
Diffstat (limited to 'fs/ecryptfs/keystore.c')
0 files changed, 0 insertions, 0 deletions