| Message ID | 164251399914.3435901.4761991152407411408.stgit@warthog.procyon.org.uk (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | fscache, cachefiles: Rewrite fixes/updates | expand |
On Tue, 2022-01-18 at 13:53 +0000, David Howells wrote: > From: Jeffle Xu <jefflexu@linux.alibaba.com> > > fscache_acquire_cache() requires a non-empty name, while 'tag <name>' > command is optional for cachefilesd. > > Thus set default tag name if it's unspecified to avoid the regression of > cachefilesd. The logic is the same with that before rewritten. > > Signed-off-by: Jeffle Xu <jefflexu@linux.alibaba.com> > Signed-off-by: David Howells <dhowells@redhat.com> > cc: linux-cachefs@redhat.com > --- > > fs/cachefiles/daemon.c | 11 +++++++++++ > 1 file changed, 11 insertions(+) > > diff --git a/fs/cachefiles/daemon.c b/fs/cachefiles/daemon.c > index 40a792421fc1..7ac04ee2c0a0 100644 > --- a/fs/cachefiles/daemon.c > +++ b/fs/cachefiles/daemon.c > @@ -703,6 +703,17 @@ static int cachefiles_daemon_bind(struct cachefiles_cache *cache, char *args) > return -EBUSY; > } > > + /* Make sure we have copies of the tag string */ > + if (!cache->tag) { > + /* > + * The tag string is released by the fops->release() > + * function, so we don't release it on error here > + */ > + cache->tag = kstrdup("CacheFiles", GFP_KERNEL); > + if (!cache->tag) > + return -ENOMEM; > + } > + > return cachefiles_add_cache(cache); > } > > > Reviewed-by: Jeff Layton <jlayton@kernel.org>
diff --git a/fs/cachefiles/daemon.c b/fs/cachefiles/daemon.c index 40a792421fc1..7ac04ee2c0a0 100644 --- a/fs/cachefiles/daemon.c +++ b/fs/cachefiles/daemon.c @@ -703,6 +703,17 @@ static int cachefiles_daemon_bind(struct cachefiles_cache *cache, char *args) return -EBUSY; } + /* Make sure we have copies of the tag string */ + if (!cache->tag) { + /* + * The tag string is released by the fops->release() + * function, so we don't release it on error here + */ + cache->tag = kstrdup("CacheFiles", GFP_KERNEL); + if (!cache->tag) + return -ENOMEM; + } + return cachefiles_add_cache(cache); }