Commit 43251dbd authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'ceph-for-5.2-rc7' of git://github.com/ceph/ceph-client 

Pull ceph fix from Ilya Dryomov:
 "A small fix for a potential -rc1 regression from Jeff"

* tag 'ceph-for-5.2-rc7' of git://github.com/ceph/ceph-client:
  ceph: fix ceph_mdsc_build_path to not stop on first component
parents 5b607ba8 d6b8bd67

fs/ceph/mds_client.c

+2 −1
Original line number Diff line number Diff line
@@ -2121,9 +2121,10 @@ char *ceph_mdsc_build_path(struct dentry *dentry, int *plen, u64 *pbase, 
		if (inode && ceph_snap(inode) == CEPH_SNAPDIR) {

			dout("build_path path+%d: %p SNAPDIR\n",

			     pos, temp);

		} else if (stop_on_nosnap && inode &&

		} else if (stop_on_nosnap && inode && dentry != temp &&

			   ceph_snap(inode) == CEPH_NOSNAP) {

			spin_unlock(&temp->d_lock);

			pos++; /* get rid of any prepended '/' */

			break;

		} else {

			pos -= temp->d_name.len;