kclient: ICONTENT -> IFILE

diff --git a/src/kernel/dir.c b/src/kernel/dir.c
index c0d47c632932f31e08cbcb55b89dea7730099455..b9f25bf1764978cb2460e00eb5baa056d428dfb4 100644 (file)
--- a/src/kernel/dir.c
+++ b/src/kernel/dir.c
@@ -437,7 +437,7 @@ static int ceph_mknod(struct inode *dir, struct dentry *dentry,
        rhead = req->r_request->front.iov_base;
        rhead->args.mknod.mode = cpu_to_le32(mode);
        rhead->args.mknod.rdev = cpu_to_le32(rdev);
-       ceph_mdsc_lease_release(mdsc, dir, NULL, CEPH_LOCK_ICONTENT);
+       ceph_mdsc_lease_release(mdsc, dir, NULL, CEPH_LOCK_IFILE);
        err = ceph_mdsc_do_request(mdsc, req);
        if (!err && req->r_reply_info.trace_numd == 0) {
                /*
@@ -511,7 +511,7 @@ static int ceph_symlink(struct inode *dir, struct dentry *dentry,
                return PTR_ERR(req);
        }
        req->r_locked_dir = dir;
-       ceph_mdsc_lease_release(mdsc, dir, NULL, CEPH_LOCK_ICONTENT);
+       ceph_mdsc_lease_release(mdsc, dir, NULL, CEPH_LOCK_IFILE);
        err = ceph_mdsc_do_request(mdsc, req);
        ceph_mdsc_put_request(req);
        if (err)
@@ -567,7 +567,7 @@ static int ceph_mkdir(struct inode *dir, struct dentry *dentry, int mode)
        rhead = req->r_request->front.iov_base;
        rhead->args.mkdir.mode = cpu_to_le32(mode);
 
-       ceph_mdsc_lease_release(mdsc, dir, NULL, CEPH_LOCK_ICONTENT);
+       ceph_mdsc_lease_release(mdsc, dir, NULL, CEPH_LOCK_IFILE);
        err = ceph_mdsc_do_request(mdsc, req);
        ceph_mdsc_put_request(req);
        if (err < 0)
@@ -613,7 +613,7 @@ static int ceph_link(struct dentry *old_dentry, struct inode *dir,
        req->r_last_dentry = dget(dentry); /* use this dentry in fill_trace */
        req->r_locked_dir = old_dentry->d_inode;
 
-       ceph_mdsc_lease_release(mdsc, dir, NULL, CEPH_LOCK_ICONTENT);
+       ceph_mdsc_lease_release(mdsc, dir, NULL, CEPH_LOCK_IFILE);
        err = ceph_mdsc_do_request(mdsc, req);
        if (err) {
                d_drop(dentry);
@@ -678,7 +678,7 @@ static int ceph_unlink(struct inode *dir, struct dentry *dentry)
        req->r_locked_dir = dir;  /* by VFS */
 
        ceph_mdsc_lease_release(mdsc, dir, dentry,
-                               CEPH_LOCK_DN|CEPH_LOCK_ICONTENT);
+                               CEPH_LOCK_DN|CEPH_LOCK_IFILE);
        ceph_mdsc_lease_release(mdsc, inode, NULL, CEPH_LOCK_ILINK);
        err = ceph_mdsc_do_request(mdsc, req);
        ceph_mdsc_put_request(req);
@@ -725,7 +725,7 @@ static int ceph_rename(struct inode *old_dir, struct dentry *old_dentry,
        req->r_last_dentry = dget(new_dentry);
        req->r_locked_dir = new_dir;
        ceph_mdsc_lease_release(mdsc, old_dir, old_dentry,
-                               CEPH_LOCK_DN|CEPH_LOCK_ICONTENT);
+                               CEPH_LOCK_DN|CEPH_LOCK_IFILE);
        if (new_dentry->d_inode)
                ceph_mdsc_lease_release(mdsc, new_dentry->d_inode, NULL,
                                        CEPH_LOCK_ILINK);
@@ -768,7 +768,7 @@ static int ceph_dentry_revalidate(struct dentry *dentry, struct nameidata *nd)
 
        if (ceph_ino(dir) != 1 &&  /* ICONTENT is meaningless on root inode */
            ceph_inode(dir)->i_version == dentry->d_time &&
-           ceph_inode_lease_valid(dir, CEPH_LOCK_ICONTENT)) {
+           ceph_inode_lease_valid(dir, CEPH_LOCK_IFILE)) {
                dout(20, "dentry_revalidate %p %lu ICONTENT on dir %p %llu\n",
                     dentry, dentry->d_time, dir, ceph_inode(dir)->i_version);
                return 1;

diff --git a/src/kernel/file.c b/src/kernel/file.c
index 8c7a1df1b070c0f9bab21dac707f2c5d1ddb946a..ba30c71c4c2d4bd36c7af26c801c45ce3d9f84f8 100644 (file)
--- a/src/kernel/file.c
+++ b/src/kernel/file.c
@@ -130,7 +130,7 @@ int ceph_open(struct inode *inode, struct file *file)
        dentry = d_find_alias(inode);
        if (!dentry)
                return -ESTALE;  /* yuck */
-       ceph_mdsc_lease_release(mdsc, inode, NULL, CEPH_LOCK_ICONTENT);
+       ceph_mdsc_lease_release(mdsc, inode, NULL, CEPH_LOCK_IFILE);
        req = prepare_open_request(inode->i_sb, dentry, flags, 0);
        if (IS_ERR(req)) {
                err = PTR_ERR(req);
@@ -178,7 +178,7 @@ struct dentry *ceph_lookup_open(struct inode *dir, struct dentry *dentry,
        if (IS_ERR(req))
                return ERR_PTR(PTR_ERR(req));
        if (flags & O_CREAT)
-               ceph_mdsc_lease_release(mdsc, dir, NULL, CEPH_LOCK_ICONTENT);
+               ceph_mdsc_lease_release(mdsc, dir, NULL, CEPH_LOCK_IFILE);
        req->r_last_dentry = dget(dentry); /* use this dentry in fill_trace */
        req->r_locked_dir = dir;           /* caller holds dir->i_mutex */
        err = ceph_mdsc_do_request(mdsc, req);

diff --git a/src/kernel/inode.c b/src/kernel/inode.c
index 368e4ce1520f19f88007eea9bb716ef435275cfe..6a7d36e2bed8fc6fa2d907548bda4ac76c636af5 100644 (file)
--- a/src/kernel/inode.c
+++ b/src/kernel/inode.c
@@ -604,14 +604,11 @@ int ceph_inode_lease_valid(struct inode *inode, int mask)
        havemask = ci->i_lease_mask;
 
        /* EXCL cap counts for an ICONTENT lease... check caps? */
-       if ((mask & CEPH_LOCK_ICONTENT) &&
+       if ((mask & CEPH_LOCK_IFILE) &&
            __ceph_caps_issued(ci, NULL) & CEPH_CAP_EXCL) {
                dout(20, "lease_valid inode %p EXCL cap -> ICONTENT\n", inode);
-               havemask |= CEPH_LOCK_ICONTENT;
+               havemask |= CEPH_LOCK_IFILE;
        }
-       /* any ICONTENT bits imply all ICONTENT bits */
-       if (havemask & CEPH_LOCK_ICONTENT)
-               havemask |= CEPH_LOCK_ICONTENT;
 
        if (ci->i_lease_session) {
                struct ceph_mds_session *s = ci->i_lease_session;
@@ -884,7 +881,7 @@ int ceph_fill_trace(struct super_block *sb, struct ceph_mds_request *req,
                /* update inode lease */
                mask = update_inode_lease(in, rinfo->trace_ilease[d],
                                          session, req->r_request_started);
-               have_icontent = mask & CEPH_LOCK_ICONTENT;
+               have_icontent = mask & CEPH_LOCK_IFILE;
 
                /* do we have a dn lease? */
                have_lease = have_icontent ||
@@ -1529,7 +1526,7 @@ static int ceph_setattr_time(struct dentry *dentry, struct iattr *attr)
        }
 
        /* if i have valid values, this may be a no-op */
-       if (ceph_inode_lease_valid(inode, CEPH_LOCK_ICONTENT) &&
+       if (ceph_inode_lease_valid(inode, CEPH_LOCK_IFILE) &&
            !(((ia_valid & ATTR_ATIME) &&
               !timespec_equal(&inode->i_atime, &attr->ia_atime)) ||
              ((ia_valid & ATTR_MTIME) &&
@@ -1551,7 +1548,7 @@ static int ceph_setattr_time(struct dentry *dentry, struct iattr *attr)
        if (ia_valid & ATTR_MTIME)
                reqh->args.utime.mask |= cpu_to_le32(CEPH_UTIME_MTIME);
 
-       ceph_mdsc_lease_release(mdsc, inode, NULL, CEPH_LOCK_ICONTENT);
+       ceph_mdsc_lease_release(mdsc, inode, NULL, CEPH_LOCK_IFILE);
        err = ceph_mdsc_do_request(mdsc, req);
        ceph_mdsc_put_request(req);
        dout(10, "utime result %d\n", err);
@@ -1584,7 +1581,7 @@ static int ceph_setattr_size(struct dentry *dentry, struct iattr *attr)
                spin_unlock(&inode->i_lock);
                return 0;
        }
-       if (ceph_inode_lease_valid(inode, CEPH_LOCK_ICONTENT) &&
+       if (ceph_inode_lease_valid(inode, CEPH_LOCK_IFILE) &&
            attr->ia_size == inode->i_size) {
                dout(10, "lease indicates truncate is a no-op\n");
                return 0;
@@ -1594,7 +1591,7 @@ static int ceph_setattr_size(struct dentry *dentry, struct iattr *attr)
                return PTR_ERR(req);
        reqh = req->r_request->front.iov_base;
        reqh->args.truncate.length = cpu_to_le64(attr->ia_size);
-       ceph_mdsc_lease_release(mdsc, inode, NULL, CEPH_LOCK_ICONTENT);
+       ceph_mdsc_lease_release(mdsc, inode, NULL, CEPH_LOCK_IFILE);
        err = ceph_mdsc_do_request(mdsc, req);
        ceph_mdsc_put_request(req);
        dout(10, "truncate result %d\n", err);

diff --git a/src/kernel/ioctl.c b/src/kernel/ioctl.c
index 927907ca736793cc73ff28da4ae240231ca791a2..d21042b9c9fbd029e32f71376785ad712b763710 100644 (file)
--- a/src/kernel/ioctl.c
+++ b/src/kernel/ioctl.c
@@ -51,7 +51,7 @@ static long ceph_ioctl_set_layout(struct file *file, void __user *arg)
        kfree(path);
        reqh = req->r_request->front.iov_base;
        reqh->args.setlayout.layout = layout;
-       ceph_mdsc_lease_release(mdsc, inode, NULL, CEPH_LOCK_ICONTENT);
+       ceph_mdsc_lease_release(mdsc, inode, NULL, CEPH_LOCK_IFILE);
        err = ceph_mdsc_do_request(mdsc, req);
        ceph_mdsc_put_request(req);
        return err;