diff options
| author | Jeff Layton <jlayton@redhat.com> | 2017-01-26 21:14:18 (GMT) |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-10-21 15:21:37 (GMT) |
| commit | df37e8fadf749d2bd7010e420baef11542ecaca9 (patch) | |
| tree | 4f877f15c9d4ee37ef8e1b7d977d0e4f3b4e4346 /fs | |
| parent | b025eb5d2678af7e2d40ffa715e173b81a5a7972 (diff) | |
| download | linux-df37e8fadf749d2bd7010e420baef11542ecaca9.tar.xz | |
ceph: don't update_dentry_lease unless we actually got one
[ Upstream commit 80d025ffede88969f6adf7266fbdedfd5641148a ]
This if block updates the dentry lease even in the case where
the MDS didn't grant one.
Signed-off-by: Jeff Layton <jlayton@redhat.com>
Reviewed-by: Yan, Zheng <zyan@redhat.com>
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/ceph/inode.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/ceph/inode.c b/fs/ceph/inode.c index 953275b..4a6df2c 100644 --- a/fs/ceph/inode.c +++ b/fs/ceph/inode.c @@ -1323,8 +1323,8 @@ retry_lookup: ceph_dir_clear_ordered(dir); dout("d_delete %p\n", dn); d_delete(dn); - } else { - if (have_lease && d_unhashed(dn)) + } else if (have_lease) { + if (d_unhashed(dn)) d_add(dn, NULL); update_dentry_lease(dn, rinfo->dlease, session, |