ceph: do not call __mark_dirty_inode under i_lock

[pandora-kernel.git] / fs / ceph / file.c

diff --git a/fs/ceph/file.c b/fs/ceph/file.c
index 159b512..203252d 100644 (file)
--- a/fs/ceph/file.c
+++ b/fs/ceph/file.c
@@ -734,9 +734,12 @@ retry_snap:
                }
        }
        if (ret >= 0) {
                }
        }
        if (ret >= 0) {

+               int dirty;

                spin_lock(&inode->i_lock);
                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);
                spin_unlock(&inode->i_lock);

+               if (dirty)
+                       __mark_inode_dirty(inode, dirty);

        }
 
 out:
        }
 
 out: