diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-28 12:12:58 +1000 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-28 12:12:58 +1000 |
commit | b12ece7d852efbc8db45371c068900fcc62002d4 (patch) | |
tree | 6344b69d72415224f784ac3c0d855ae334a612d2 /fs/gfs2/acl.c | |
parent | 363aab29eb89b46d14d44e4a44a5fff57e30bcfc (diff) | |
parent | d66bbd441c08fe00ed2add1cf70cb243ebc2b27e (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:
ceph: avoid picking MDS that is not active
ceph: avoid immediate cap check after import
ceph: fix flushing of caps vs cap import
ceph: fix erroneous cap flush to non-auth mds
ceph: fix cap_wanted_delay_{min,max} mount option initialization
ceph: fix xattr rbtree search
ceph: fix getattr on directory when using norbytes
Diffstat (limited to 'fs/gfs2/acl.c')
0 files changed, 0 insertions, 0 deletions