git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
[pandora-kernel.git]
/
fs
/
ceph
/
snap.c
diff --git
a/fs/ceph/snap.c
b/fs/ceph/snap.c
index
e264371
..
a559c80
100644
(file)
--- a/
fs/ceph/snap.c
+++ b/
fs/ceph/snap.c
@@
-446,7
+446,7
@@
void ceph_queue_cap_snap(struct ceph_inode_info *ci)
return;
}
return;
}
- spin_lock(&
inode->i
_lock);
+ spin_lock(&
ci->i_ceph
_lock);
used = __ceph_caps_used(ci);
dirty = __ceph_caps_dirty(ci);
used = __ceph_caps_used(ci);
dirty = __ceph_caps_dirty(ci);
@@
-528,7
+528,7
@@
void ceph_queue_cap_snap(struct ceph_inode_info *ci)
kfree(capsnap);
}
kfree(capsnap);
}
- spin_unlock(&
inode->i
_lock);
+ spin_unlock(&
ci->i_ceph
_lock);
}
/*
}
/*
@@
-537,7
+537,7
@@
void ceph_queue_cap_snap(struct ceph_inode_info *ci)
*
* If capsnap can now be flushed, add to snap_flush list, and return 1.
*
*
* If capsnap can now be flushed, add to snap_flush list, and return 1.
*
- * Caller must hold i_lock.
+ * Caller must hold i_
ceph_
lock.
*/
int __ceph_finish_cap_snap(struct ceph_inode_info *ci,
struct ceph_cap_snap *capsnap)
*/
int __ceph_finish_cap_snap(struct ceph_inode_info *ci,
struct ceph_cap_snap *capsnap)
@@
-739,9
+739,9
@@
static void flush_snaps(struct ceph_mds_client *mdsc)
inode = &ci->vfs_inode;
ihold(inode);
spin_unlock(&mdsc->snap_flush_lock);
inode = &ci->vfs_inode;
ihold(inode);
spin_unlock(&mdsc->snap_flush_lock);
- spin_lock(&
inode->i
_lock);
+ spin_lock(&
ci->i_ceph
_lock);
__ceph_flush_snaps(ci, &session, 0);
__ceph_flush_snaps(ci, &session, 0);
- spin_unlock(&
inode->i
_lock);
+ spin_unlock(&
ci->i_ceph
_lock);
iput(inode);
spin_lock(&mdsc->snap_flush_lock);
}
iput(inode);
spin_lock(&mdsc->snap_flush_lock);
}
@@
-847,7
+847,7
@@
void ceph_handle_snap(struct ceph_mds_client *mdsc,
continue;
ci = ceph_inode(inode);
continue;
ci = ceph_inode(inode);
- spin_lock(&
inode->i
_lock);
+ spin_lock(&
ci->i_ceph
_lock);
if (!ci->i_snap_realm)
goto skip_inode;
/*
if (!ci->i_snap_realm)
goto skip_inode;
/*
@@
-876,7
+876,7
@@
void ceph_handle_snap(struct ceph_mds_client *mdsc,
oldrealm = ci->i_snap_realm;
ci->i_snap_realm = realm;
spin_unlock(&realm->inodes_with_caps_lock);
oldrealm = ci->i_snap_realm;
ci->i_snap_realm = realm;
spin_unlock(&realm->inodes_with_caps_lock);
- spin_unlock(&
inode->i
_lock);
+ spin_unlock(&
ci->i_ceph
_lock);
ceph_get_snap_realm(mdsc, realm);
ceph_put_snap_realm(mdsc, oldrealm);
ceph_get_snap_realm(mdsc, realm);
ceph_put_snap_realm(mdsc, oldrealm);
@@
-885,7
+885,7
@@
void ceph_handle_snap(struct ceph_mds_client *mdsc,
continue;
skip_inode:
continue;
skip_inode:
- spin_unlock(&
inode->i
_lock);
+ spin_unlock(&
ci->i_ceph
_lock);
iput(inode);
}
iput(inode);
}