Commit fca65b4a authored by Sage Weil's avatar Sage Weil
Browse files

ceph: do not call __mark_dirty_inode under i_lock 



The __mark_dirty_inode helper now takes i_lock as of 250df6ed.  Fix the
one ceph callers that held i_lock (__ceph_mark_dirty_caps) to return the
flags value so that the callers can do it outside of i_lock.

Signed-off-by: default avatarSage Weil <sage@newdream.net>
parent 4ad12621

fs/ceph/caps.c

+5 −5
Original line number Diff line number Diff line
@@ -1331,10 +1331,11 @@ static void ceph_flush_snaps(struct ceph_inode_info *ci) 
}



/*

 * Mark caps dirty.  If inode is newly dirty, add to the global dirty

 * list.

 * Mark caps dirty.  If inode is newly dirty, return the dirty flags.

 * Caller is then responsible for calling __mark_inode_dirty with the

 * returned flags value.

 */

void __ceph_mark_dirty_caps(struct ceph_inode_info *ci, int mask)

int __ceph_mark_dirty_caps(struct ceph_inode_info *ci, int mask)

{

	struct ceph_mds_client *mdsc =

		ceph_sb_to_client(ci->vfs_inode.i_sb)->mdsc;
@@ -1365,9 +1366,8 @@ void __ceph_mark_dirty_caps(struct ceph_inode_info *ci, int mask) 
	if (((was | ci->i_flushing_caps) & CEPH_CAP_FILE_BUFFER) &&

	    (mask & CEPH_CAP_FILE_BUFFER))

		dirty |= I_DIRTY_DATASYNC;

	if (dirty)

		__mark_inode_dirty(inode, dirty);

	__cap_delay_requeue(mdsc, ci);

	return dirty;

}



/*

fs/ceph/file.c

+4 −1
Original line number Diff line number Diff line
@@ -734,9 +734,12 @@ retry_snap: 
		}

	}

	if (ret >= 0) {

		int dirty;

		spin_lock(&inode->i_lock);

		__ceph_mark_dirty_caps(ci, CEPH_CAP_FILE_WR);

		dirty = __ceph_mark_dirty_caps(ci, CEPH_CAP_FILE_WR);

		spin_unlock(&inode->i_lock);

		if (dirty)

			__mark_inode_dirty(inode, dirty);

	}



out:

fs/ceph/inode.c

+5 −1
Original line number Diff line number Diff line
@@ -1567,6 +1567,7 @@ int ceph_setattr(struct dentry *dentry, struct iattr *attr) 
	int release = 0, dirtied = 0;

	int mask = 0;

	int err = 0;

	int inode_dirty_flags = 0;



	if (ceph_snap(inode) != CEPH_NOSNAP)

		return -EROFS;
@@ -1725,13 +1726,16 @@ int ceph_setattr(struct dentry *dentry, struct iattr *attr) 
		dout("setattr %p ATTR_FILE ... hrm!\n", inode);



	if (dirtied) {

		__ceph_mark_dirty_caps(ci, dirtied);

		inode_dirty_flags = __ceph_mark_dirty_caps(ci, dirtied);

		inode->i_ctime = CURRENT_TIME;

	}



	release &= issued;

	spin_unlock(&inode->i_lock);



	if (inode_dirty_flags)

		__mark_inode_dirty(inode, inode_dirty_flags);



	if (mask) {

		req->r_inode = igrab(inode);

		req->r_inode_drop = release;

fs/ceph/super.h

+1 −1
Original line number Diff line number Diff line
@@ -506,7 +506,7 @@ static inline int __ceph_caps_dirty(struct ceph_inode_info *ci) 
{

	return ci->i_dirty_caps | ci->i_flushing_caps;

}

extern void __ceph_mark_dirty_caps(struct ceph_inode_info *ci, int mask);

extern int __ceph_mark_dirty_caps(struct ceph_inode_info *ci, int mask);



extern int ceph_caps_revoking(struct ceph_inode_info *ci, int mask);

extern int __ceph_caps_used(struct ceph_inode_info *ci);

fs/ceph/xattr.c

+8 −4
Original line number Diff line number Diff line
@@ -703,6 +703,7 @@ int ceph_setxattr(struct dentry *dentry, const char *name, 
	struct ceph_inode_xattr *xattr = NULL;

	int issued;

	int required_blob_size;

	int dirty;



	if (ceph_snap(inode) != CEPH_NOSNAP)

		return -EROFS;
@@ -763,11 +764,12 @@ retry: 
	dout("setxattr %p issued %s\n", inode, ceph_cap_string(issued));

	err = __set_xattr(ci, newname, name_len, newval,

			  val_len, 1, 1, 1, &xattr);

	__ceph_mark_dirty_caps(ci, CEPH_CAP_XATTR_EXCL);

	dirty = __ceph_mark_dirty_caps(ci, CEPH_CAP_XATTR_EXCL);

	ci->i_xattrs.dirty = true;

	inode->i_ctime = CURRENT_TIME;

	spin_unlock(&inode->i_lock);



	if (dirty)

		__mark_inode_dirty(inode, dirty);

	return err;



do_sync:
@@ -810,6 +812,7 @@ int ceph_removexattr(struct dentry *dentry, const char *name) 
	struct ceph_vxattr_cb *vxattrs = ceph_inode_vxattrs(inode);

	int issued;

	int err;

	int dirty;



	if (ceph_snap(inode) != CEPH_NOSNAP)

		return -EROFS;
@@ -833,12 +836,13 @@ int ceph_removexattr(struct dentry *dentry, const char *name) 
		goto do_sync;



	err = __remove_xattr_by_name(ceph_inode(inode), name);

	__ceph_mark_dirty_caps(ci, CEPH_CAP_XATTR_EXCL);

	dirty = __ceph_mark_dirty_caps(ci, CEPH_CAP_XATTR_EXCL);

	ci->i_xattrs.dirty = true;

	inode->i_ctime = CURRENT_TIME;



	spin_unlock(&inode->i_lock);



	if (dirty)

		__mark_inode_dirty(inode, dirty);

	return err;

do_sync:

	spin_unlock(&inode->i_lock);

CRA Git | Maintained and supported by SUSTech CRA and CCSE