Commit 6e203506 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'ceph-for-4.12-rc6' of git://github.com/ceph/ceph-client 

Pull ceph fixes from Ilya Dryomov:
 "A fix for an old ceph ->fh_to_* bug from Luis and two timestamp fixups
  from Zheng, prompted by the ongoing y2038 work"

* tag 'ceph-for-4.12-rc6' of git://github.com/ceph/ceph-client:
  ceph: unify inode i_ctime update
  ceph: use current_kernel_time() to get request time stamp
  ceph: check i_nlink while converting a file handle to dentry
parents adc31103 4ca2fea6

fs/ceph/acl.c

+1 −0
Original line number Diff line number Diff line
@@ -131,6 +131,7 @@ int ceph_set_acl(struct inode *inode, struct posix_acl *acl, int type) 
	}



	if (new_mode != old_mode) {

		newattrs.ia_ctime = current_time(inode);

		newattrs.ia_mode = new_mode;

		newattrs.ia_valid = ATTR_MODE;

		ret = __ceph_setattr(inode, &newattrs);

fs/ceph/export.c

+4 −0
Original line number Diff line number Diff line
@@ -91,6 +91,10 @@ static struct dentry *__fh_to_dentry(struct super_block *sb, u64 ino) 
		ceph_mdsc_put_request(req);

		if (!inode)

			return ERR_PTR(-ESTALE);

		if (inode->i_nlink == 0) {

			iput(inode);

			return ERR_PTR(-ESTALE);

		}

	}



	return d_obtain_alias(inode);

fs/ceph/inode.c

+2 −3
Original line number Diff line number Diff line
@@ -2022,7 +2022,6 @@ int __ceph_setattr(struct inode *inode, struct iattr *attr) 
		    attr->ia_size > inode->i_size) {

			i_size_write(inode, attr->ia_size);

			inode->i_blocks = calc_inode_blocks(attr->ia_size);

			inode->i_ctime = attr->ia_ctime;

			ci->i_reported_size = attr->ia_size;

			dirtied |= CEPH_CAP_FILE_EXCL;

		} else if ((issued & CEPH_CAP_FILE_SHARED) == 0 ||
@@ -2044,7 +2043,6 @@ int __ceph_setattr(struct inode *inode, struct iattr *attr) 
		     inode->i_ctime.tv_sec, inode->i_ctime.tv_nsec,

		     attr->ia_ctime.tv_sec, attr->ia_ctime.tv_nsec,

		     only ? "ctime only" : "ignored");

		inode->i_ctime = attr->ia_ctime;

		if (only) {

			/*

			 * if kernel wants to dirty ctime but nothing else,
@@ -2067,7 +2065,7 @@ int __ceph_setattr(struct inode *inode, struct iattr *attr) 
	if (dirtied) {

		inode_dirty_flags = __ceph_mark_dirty_caps(ci, dirtied,

							   &prealloc_cf);

		inode->i_ctime = current_time(inode);

		inode->i_ctime = attr->ia_ctime;

	}



	release &= issued;
@@ -2085,6 +2083,7 @@ int __ceph_setattr(struct inode *inode, struct iattr *attr) 
		req->r_inode_drop = release;

		req->r_args.setattr.mask = cpu_to_le32(mask);

		req->r_num_caps = 1;

		req->r_stamp = attr->ia_ctime;

		err = ceph_mdsc_do_request(mdsc, NULL, req);

	}

	dout("setattr %p result=%d (%s locally, %d remote)\n", inode, err,

fs/ceph/mds_client.c

+1 −3
Original line number Diff line number Diff line
@@ -1687,7 +1687,6 @@ struct ceph_mds_request * 
ceph_mdsc_create_request(struct ceph_mds_client *mdsc, int op, int mode)

{

	struct ceph_mds_request *req = kzalloc(sizeof(*req), GFP_NOFS);

	struct timespec ts;



	if (!req)

		return ERR_PTR(-ENOMEM);
@@ -1706,8 +1705,7 @@ ceph_mdsc_create_request(struct ceph_mds_client *mdsc, int op, int mode) 
	init_completion(&req->r_safe_completion);

	INIT_LIST_HEAD(&req->r_unsafe_item);



	ktime_get_real_ts(&ts);

	req->r_stamp = timespec_trunc(ts, mdsc->fsc->sb->s_time_gran);

	req->r_stamp = timespec_trunc(current_kernel_time(), mdsc->fsc->sb->s_time_gran);



	req->r_op = op;

	req->r_direct_mode = mode;

CRA Git | Maintained and supported by SUSTech CRA and CCSE