diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-05-10 17:05:24 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-05-10 17:05:45 +0200 |
| commit | 932fed4e2e42c3d730c01bb63b1c4f812c533d5b (patch) | |
| tree | 11b1afac3a40d253cdb905c42901edfaae5e196e /fs/ceph/file.c | |
| parent | 57d524154ffe99d27fb55e0e30ddbad9f4c35806 (diff) | |
| parent | 693d92a1bbc9e42681c42ed190bd42b636ca876f (diff) | |
Merge commit 'v2.6.39-rc7' into perf/core
Merge reason: pull in the latest fixes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'fs/ceph/file.c')
| -rw-r--r-- | fs/ceph/file.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/fs/ceph/file.c b/fs/ceph/file.c index 159b512d5a2..203252d88d9 100644 --- a/fs/ceph/file.c +++ b/fs/ceph/file.c @@ -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: |