summaryrefslogtreecommitdiff
path: root/fs/ocfs2/alloc.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-08-22 20:58:05 +0400
committerLinus Torvalds <torvalds@linux-foundation.org>2012-08-22 20:58:05 +0400
commitf753c4ec151c5c385fa0508a29aa793dee966325 (patch)
tree934e16b1aaa6c16a73e0c1d94d36997ef7ad419d /fs/ocfs2/alloc.c
parentad746be96941ddd2fb31fad7a629de7912051c8d (diff)
parent45f2e081f573526977abfa781a12728f83e9641f (diff)
downloadlinux-f753c4ec151c5c385fa0508a29aa793dee966325.tar.xz
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client
Pull ceph fixes from Sage Weil: "Jim's fix closes a narrow race introduced with the msgr changes. One fix resolves problems with debugfs initialization that Yan found when multiple client instances are created (e.g., two clusters mounted, or rbd + cephfs), another one fixes problems with mounting a nonexistent server subdirectory, and the last one fixes a divide by zero error from unsanitized ioctl input that Dan Carpenter found." * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client: ceph: avoid divide by zero in __validate_layout() libceph: avoid truncation due to racing banners ceph: tolerate (and warn on) extraneous dentry from mds libceph: delay debugfs initialization until we learn global_id
Diffstat (limited to 'fs/ocfs2/alloc.c')
0 files changed, 0 insertions, 0 deletions