Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1c1266bb authored by Yehuda Sadeh's avatar Yehuda Sadeh Committed by Sage Weil
Browse files

ceph: fix getattr on directory when using norbytes 



The norbytes mount option was broken, and when doing getattr
on a directory it return the rbytes instead of the number of
entities. This commit fixes it.

Signed-off-by: default avatarYehuda Sadeh <yehuda@hq.newdream.net>
Signed-off-by: default avatarSage Weil <sage@newdream.net>
parent 766fc439

fs/ceph/inode.c

+5 −5
Original line number Diff line number Diff line
@@ -701,10 +701,6 @@ static int fill_inode(struct inode *inode, 
			ci->i_ceph_flags |= CEPH_I_COMPLETE;

			ci->i_max_offset = 2;

		}



		/* it may be better to set st_size in getattr instead? */

		if (ceph_test_mount_opt(ceph_sb_to_client(inode->i_sb), RBYTES))

			inode->i_size = ci->i_rbytes;

		break;

	default:

		pr_err("fill_inode %llx.%llx BAD mode 0%o\n",
@@ -1805,7 +1801,11 @@ int ceph_getattr(struct vfsmount *mnt, struct dentry *dentry, 
		else

			stat->dev = 0;

		if (S_ISDIR(inode->i_mode)) {

			if (ceph_test_mount_opt(ceph_sb_to_client(inode->i_sb),

						RBYTES))

				stat->size = ci->i_rbytes;

			else

				stat->size = ci->i_files + ci->i_subdirs;

			stat->blocks = 0;

			stat->blksize = 65536;

		}