Commit af9468db authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'ceph-for-4.9-rc9' of git://github.com/ceph/ceph-client 

Pull ceph fix from Ilya Dryomov:
 "A fix for an issue with ->d_revalidate() in ceph, causing frequent
  kernel crashes.

  Marked for stable - it goes back to 4.6, but started popping up only
  in 4.8"

* tag 'ceph-for-4.9-rc9' of git://github.com/ceph/ceph-client:
  ceph: don't set req->r_locked_dir in ceph_d_revalidate
parents 1f6c926c c3f4688a

fs/ceph/dir.c

+14 −10
Original line number Diff line number Diff line
@@ -1261,26 +1261,30 @@ static int ceph_d_revalidate(struct dentry *dentry, unsigned int flags) 
			return -ECHILD;



		op = ceph_snap(dir) == CEPH_SNAPDIR ?

			CEPH_MDS_OP_LOOKUPSNAP : CEPH_MDS_OP_LOOKUP;

			CEPH_MDS_OP_LOOKUPSNAP : CEPH_MDS_OP_GETATTR;

		req = ceph_mdsc_create_request(mdsc, op, USE_ANY_MDS);

		if (!IS_ERR(req)) {

			req->r_dentry = dget(dentry);

			req->r_num_caps = 2;

			req->r_num_caps = op == CEPH_MDS_OP_GETATTR ? 1 : 2;



			mask = CEPH_STAT_CAP_INODE | CEPH_CAP_AUTH_SHARED;

			if (ceph_security_xattr_wanted(dir))

				mask |= CEPH_CAP_XATTR_SHARED;

			req->r_args.getattr.mask = mask;



			req->r_locked_dir = dir;

			err = ceph_mdsc_do_request(mdsc, NULL, req);

			if (err == 0 || err == -ENOENT) {

				if (dentry == req->r_dentry) {

					valid = !d_unhashed(dentry);

				} else {

					d_invalidate(req->r_dentry);

					err = -EAGAIN;

				}

			switch (err) {

			case 0:

				if (d_really_is_positive(dentry) &&

				    d_inode(dentry) == req->r_target_inode)

					valid = 1;

				break;

			case -ENOENT:

				if (d_really_is_negative(dentry))

					valid = 1;

				/* Fallthrough */

			default:

				break;

			}

			ceph_mdsc_put_request(req);

			dout("d_revalidate %p lookup result=%d\n",

CRA Git | Maintained and supported by SUSTech CRA and CCSE