Commit 2f92b3d0 authored by Yan, Zheng's avatar Yan, Zheng Committed by Ilya Dryomov
Browse files

ceph: properly mark empty directory as complete 



ceph_add_cap() calls __check_cap_issue(), which clears directory
inode' complete flag. so we should set the complete flag for empty
directory should be set after calling ceph_add_cap().

Signed-off-by: default avatarYan, Zheng <zyan@redhat.com>
parent a6a5ce4f

fs/ceph/inode.c

+15 −14
Original line number Original line Diff line number Diff line
@@ -840,30 +840,31 @@ static int fill_inode(struct inode *inode, struct page *locked_page, 
		       ceph_vinop(inode), inode->i_mode);

		       ceph_vinop(inode), inode->i_mode);

	}

	}





	/* set dir completion flag? */

	if (S_ISDIR(inode->i_mode) &&

	    ci->i_files == 0 && ci->i_subdirs == 0 &&

	    ceph_snap(inode) == CEPH_NOSNAP &&

	    (le32_to_cpu(info->cap.caps) & CEPH_CAP_FILE_SHARED) &&

	    (issued & CEPH_CAP_FILE_EXCL) == 0 &&

	    !__ceph_dir_is_complete(ci)) {

		dout(" marking %p complete (empty)\n", inode);

		__ceph_dir_set_complete(ci, atomic_read(&ci->i_release_count),

					ci->i_ordered_count);

	}



	/* were we issued a capability? */

	/* were we issued a capability? */

	if (info->cap.caps) {

	if (info->cap.caps) {

		if (ceph_snap(inode) == CEPH_NOSNAP) {

		if (ceph_snap(inode) == CEPH_NOSNAP) {

			unsigned caps = le32_to_cpu(info->cap.caps);

			ceph_add_cap(inode, session,

			ceph_add_cap(inode, session,

				     le64_to_cpu(info->cap.cap_id),

				     le64_to_cpu(info->cap.cap_id),

				     cap_fmode,

				     cap_fmode, caps,

				     le32_to_cpu(info->cap.caps),

				     le32_to_cpu(info->cap.wanted),

				     le32_to_cpu(info->cap.wanted),

				     le32_to_cpu(info->cap.seq),

				     le32_to_cpu(info->cap.seq),

				     le32_to_cpu(info->cap.mseq),

				     le32_to_cpu(info->cap.mseq),

				     le64_to_cpu(info->cap.realm),

				     le64_to_cpu(info->cap.realm),

				     info->cap.flags, &new_cap);

				     info->cap.flags, &new_cap);



			/* set dir completion flag? */

			if (S_ISDIR(inode->i_mode) &&

			    ci->i_files == 0 && ci->i_subdirs == 0 &&

			    (caps & CEPH_CAP_FILE_SHARED) &&

			    (issued & CEPH_CAP_FILE_EXCL) == 0 &&

			    !__ceph_dir_is_complete(ci)) {

				dout(" marking %p complete (empty)\n", inode);

				__ceph_dir_set_complete(ci,

					atomic_read(&ci->i_release_count),

					ci->i_ordered_count);

			}



			wake = true;

			wake = true;

		} else {

		} else {

			dout(" %p got snap_caps %s\n", inode,

			dout(" %p got snap_caps %s\n", inode,