From 88b502147b1c1eb014c0bb0320a4a80baeb19549 Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@newdream.net>
Date: Thu, 12 May 2011 14:28:05 -0700
Subject: [PATCH] --- yaml --- r: 251303 b: refs/heads/master c:
 ae598083015e22d1802617c18d3408971b1bddc0 h: refs/heads/master i:   251301:
 a7dd0b0a03f0c094adb8bf094756d66fa2304667   251299:
 e233b199917a0f97c1a92b819b5c6277469343c7   251295:
 98a85a29a66b4a3ae88dba39d9411f50c660381a v: v3

---
 [refs]              | 2 +-
 trunk/fs/ceph/dir.c | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 75663ce89c52..aafb87dbf398 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e8f54ce169125a2e59330fac25ad3c9ac0ce22a5
+refs/heads/master: ae598083015e22d1802617c18d3408971b1bddc0
diff --git a/trunk/fs/ceph/dir.c b/trunk/fs/ceph/dir.c
index 1a867a3601ae..53a5eb417856 100644
--- a/trunk/fs/ceph/dir.c
+++ b/trunk/fs/ceph/dir.c
@@ -1066,16 +1066,17 @@ static ssize_t ceph_read_dir(struct file *file, char __user *buf, size_t size,
 	struct inode *inode = file->f_dentry->d_inode;
 	struct ceph_inode_info *ci = ceph_inode(inode);
 	int left;
+	const int bufsize = 1024;
 
 	if (!ceph_test_mount_opt(ceph_sb_to_client(inode->i_sb), DIRSTAT))
 		return -EISDIR;
 
 	if (!cf->dir_info) {
-		cf->dir_info = kmalloc(1024, GFP_NOFS);
+		cf->dir_info = kmalloc(bufsize, GFP_NOFS);
 		if (!cf->dir_info)
 			return -ENOMEM;
 		cf->dir_info_len =
-			sprintf(cf->dir_info,
+			snprintf(cf->dir_info, bufsize,
 				"entries:   %20lld\n"
 				" files:    %20lld\n"
 				" subdirs:  %20lld\n"