diff options
author | Sage Weil <sage@newdream.net> | 2011-11-11 09:48:53 -0800 |
---|---|---|
committer | Sage Weil <sage@newdream.net> | 2012-01-10 08:56:56 -0800 |
commit | 3d8eb7a94e8f25a33362f708974ac7daae9e84f8 (patch) | |
tree | 5392b81331ea8733ac25e7a390ae64dbcd3b382a /fs/ceph/mds_client.c | |
parent | 186482560f660b8dbf77ee43aa6489cb45d342cd (diff) | |
download | linux-3d8eb7a94e8f25a33362f708974ac7daae9e84f8.tar.gz linux-3d8eb7a94e8f25a33362f708974ac7daae9e84f8.tar.bz2 linux-3d8eb7a94e8f25a33362f708974ac7daae9e84f8.zip |
ceph: remove unnecessary d_fsdata conditional checks
We now set d_fsdata unconditionally on all dentries prior to setting up
the d_ops, so all of these checks are unnecessary.
Signed-off-by: Sage Weil <sage@newdream.net>
Diffstat (limited to 'fs/ceph/mds_client.c')
-rw-r--r-- | fs/ceph/mds_client.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/ceph/mds_client.c b/fs/ceph/mds_client.c index 6203d805eb45..23ab6a3f1825 100644 --- a/fs/ceph/mds_client.c +++ b/fs/ceph/mds_client.c @@ -2772,7 +2772,7 @@ static void handle_lease(struct ceph_mds_client *mdsc, di = ceph_dentry(dentry); switch (h->action) { case CEPH_MDS_LEASE_REVOKE: - if (di && di->lease_session == session) { + if (di->lease_session == session) { if (ceph_seq_cmp(di->lease_seq, seq) > 0) h->seq = cpu_to_le32(di->lease_seq); __ceph_mdsc_drop_dentry_lease(dentry); @@ -2781,7 +2781,7 @@ static void handle_lease(struct ceph_mds_client *mdsc, break; case CEPH_MDS_LEASE_RENEW: - if (di && di->lease_session == session && + if (di->lease_session == session && di->lease_gen == session->s_cap_gen && di->lease_renew_from && di->lease_renew_after == 0) { |