Commit 467c5251 authored by Sage Weil's avatar Sage Weil
Browse files

ceph: fix dn offset during readdir_prepopulate 



When adding the readdir results to the cache, ceph_set_dentry_offset was
clobbered our just-set offset.  This can cause the readdir result offsets
to get out of sync with the server.  Add an argument to the helper so
that it does not.

This bug was introduced by 1cd3935b.

Signed-off-by: default avatarSage Weil <sage@newdream.net>
parent a77d9f7d

fs/ceph/inode.c

+6 −5
Original line number Diff line number Diff line
@@ -845,7 +845,7 @@ static void ceph_set_dentry_offset(struct dentry *dn) 
 * the caller) if we fail.

 */

static struct dentry *splice_dentry(struct dentry *dn, struct inode *in,

				    bool *prehash)

				    bool *prehash, bool set_offset)

{

	struct dentry *realdn;
@@ -877,6 +877,7 @@ static struct dentry *splice_dentry(struct dentry *dn, struct inode *in, 
	}

	if ((!prehash || *prehash) && d_unhashed(dn))

		d_rehash(dn);

	if (set_offset)

		ceph_set_dentry_offset(dn);

out:

	return dn;
@@ -1062,7 +1063,7 @@ int ceph_fill_trace(struct super_block *sb, struct ceph_mds_request *req, 
				d_delete(dn);

				goto done;

			}

			dn = splice_dentry(dn, in, &have_lease);

			dn = splice_dentry(dn, in, &have_lease, true);

			if (IS_ERR(dn)) {

				err = PTR_ERR(dn);

				goto done;
@@ -1105,7 +1106,7 @@ int ceph_fill_trace(struct super_block *sb, struct ceph_mds_request *req, 
			goto done;

		}

		dout(" linking snapped dir %p to dn %p\n", in, dn);

		dn = splice_dentry(dn, in, NULL);

		dn = splice_dentry(dn, in, NULL, true);

		if (IS_ERR(dn)) {

			err = PTR_ERR(dn);

			goto done;
@@ -1237,7 +1238,7 @@ retry_lookup: 
				err = PTR_ERR(in);

				goto out;

			}

			dn = splice_dentry(dn, in, NULL);

			dn = splice_dentry(dn, in, NULL, false);

			if (IS_ERR(dn))

				dn = NULL;

		}

CRA Git | Maintained and supported by SUSTech CRA and CCSE