diff options
| author |   Paul Moore <pmoore@redhat.com> | 2014-01-23 15:52:06 -0500 |
|---|---|---|
| committer | Paul Moore <pmoore@redhat.com> | 2014-01-23 15:52:06 -0500 |
| commit | 41be702a542a0d14bb0b1c16e824fa9ed27616ec (patch) | |
| tree | e48942a05882da47544e179c6a0c920e00137a6a /fs/cachefiles/interface.c | |
| parent | SELinux: Fix memory leak upon loading policy (diff) | |
| parent | Linux 3.13 (diff) | |
| download | wireguard-linux-41be702a542a0d14bb0b1c16e824fa9ed27616ec.tar.xz wireguard-linux-41be702a542a0d14bb0b1c16e824fa9ed27616ec.zip | |
Merge tag 'v3.13' into next
Linux 3.13
Minor fixup needed in selinux_inet_conn_request()
Conflicts:
security/selinux/hooks.c
Diffstat (limited to 'fs/cachefiles/interface.c')
| -rw-r--r-- | fs/cachefiles/interface.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/cachefiles/interface.c b/fs/cachefiles/interface.c index 43eb5592cdea..57e17fe6121a 100644 --- a/fs/cachefiles/interface.c +++ b/fs/cachefiles/interface.c @@ -270,7 +270,7 @@ static void cachefiles_drop_object(struct fscache_object *_object) #endif /* delete retired objects */ - if (test_bit(FSCACHE_COOKIE_RETIRED, &object->fscache.cookie->flags) && + if (test_bit(FSCACHE_OBJECT_RETIRED, &object->fscache.flags) && _object != cache->cache.fsdef ) { _debug("- retire object OBJ%x", object->fscache.debug_id); @@ -449,14 +449,14 @@ static int cachefiles_attr_changed(struct fscache_object *_object) _debug("discard tail %llx", oi_size); newattrs.ia_valid = ATTR_SIZE; newattrs.ia_size = oi_size & PAGE_MASK; - ret = notify_change(object->backer, &newattrs); + ret = notify_change(object->backer, &newattrs, NULL); if (ret < 0) goto truncate_failed; } newattrs.ia_valid = ATTR_SIZE; newattrs.ia_size = ni_size; - ret = notify_change(object->backer, &newattrs); + ret = notify_change(object->backer, &newattrs, NULL); truncate_failed: mutex_unlock(&object->backer->d_inode->i_mutex); |