diff options
| author | Andy Shevchenko <andriy.shevchenko@linux.intel.com> | 2017-11-03 12:50:41 +0100 |
|---|---|---|
| committer | Andy Shevchenko <andriy.shevchenko@linux.intel.com> | 2017-11-03 12:50:41 +0100 |
| commit | 7d9a6ef558f6ff375aab9e29f08124cb0daa9bc5 (patch) | |
| tree | 3916e6cf9678a41081ae822ef67ec5cae1c1fffa /fs/ceph/snap.c | |
| parent | platform/x86: silead_dmi: Add entry for the Digma e200 tablet (diff) | |
| parent | i2c-cht-wc: Add device-properties for fusb302 integration (diff) | |
| download | linux-7d9a6ef558f6ff375aab9e29f08124cb0daa9bc5.tar.xz linux-7d9a6ef558f6ff375aab9e29f08124cb0daa9bc5.zip | |
Merge branch 'i2c/cht-wc-fusb302-immutable' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
Pull i2c/cht-wc-fusb302-immutable immutable branch from Wolfram Sang:
as discussed before, here is the immutable branch for the i2c-cht-wc
driver, so you can safely apply Hans' patch [1]
"platform/x86: intel_cht_int33fe: Update fusb302 type string, add properties"
on top of this.
[1] http://patchwork.ozlabs.org/patch/824314/
Diffstat (limited to 'fs/ceph/snap.c')
| -rw-r--r-- | fs/ceph/snap.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/fs/ceph/snap.c b/fs/ceph/snap.c index 1ffc8b426c1c..7fc0b850c352 100644 --- a/fs/ceph/snap.c +++ b/fs/ceph/snap.c @@ -374,12 +374,10 @@ static int build_snap_context(struct ceph_snap_realm *realm, realm->ino, realm, snapc, snapc->seq, (unsigned int) snapc->num_snaps); - if (realm->cached_context) { - ceph_put_snap_context(realm->cached_context); - /* queue realm for cap_snap creation */ - list_add_tail(&realm->dirty_item, dirty_realms); - } + ceph_put_snap_context(realm->cached_context); realm->cached_context = snapc; + /* queue realm for cap_snap creation */ + list_add_tail(&realm->dirty_item, dirty_realms); return 0; fail: |