summaryrefslogtreecommitdiff
path: root/usr/src/uts/common/fs/cachefs
diff options
context:
space:
mode:
authorsamf <none@none>2005-12-09 16:08:04 -0800
committersamf <none@none>2005-12-09 16:08:04 -0800
commit034f45f6fb4ea4f9fabe8da11066f6c7006d106f (patch)
treed634cc34fa517f9cfe01e1e78312fa94fffac6dd /usr/src/uts/common/fs/cachefs
parentb4b07f87732ff9503ab24ed538a3fdb16727ab88 (diff)
downloadillumos-gate-034f45f6fb4ea4f9fabe8da11066f6c7006d106f.tar.gz
6342683 don't call cachefs_nocache() on failure to cache ACL
Diffstat (limited to 'usr/src/uts/common/fs/cachefs')
-rw-r--r--usr/src/uts/common/fs/cachefs/cachefs_vnops.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/usr/src/uts/common/fs/cachefs/cachefs_vnops.c b/usr/src/uts/common/fs/cachefs/cachefs_vnops.c
index d4771d091f..796d4a7173 100644
--- a/usr/src/uts/common/fs/cachefs/cachefs_vnops.c
+++ b/usr/src/uts/common/fs/cachefs/cachefs_vnops.c
@@ -9264,6 +9264,14 @@ cachefs_cacheacl(cnode_t *cp, vsecattr_t *vsecp)
printf("cachefs_cacheacl: setsecattr: error %d\n",
error);
#endif /* CFSDEBUG */
+ /*
+ * If there was an error, we don't want to call
+ * cachefs_nocache(); so, set error to 0.
+ * We will call cachefs_purgeacl(), in order to
+ * clean such things as adjunct ACL directories.
+ */
+ cachefs_purgeacl(cp);
+ error = 0;
goto out;
}
if (vp == cp->c_frontvp)