Remove the --max-links GC option

We don't need this anymore now that current filesystems support more
than 32,000 files in a directory.
This commit is contained in:
Eelco Dolstra 2012-03-26 20:00:02 +02:00
parent 19d9762ad5
commit 8be1979f1a
7 changed files with 3 additions and 30 deletions

View file

@ -418,7 +418,7 @@ bool LocalStore::isActiveTempFile(const GCState & state,
&& state.tempRoots.find(string(path, 0, path.size() - suffix.size())) != state.tempRoots.end();
}
bool LocalStore::tryToDelete(GCState & state, const Path & path)
{
checkInterrupt();
@ -514,16 +514,6 @@ bool LocalStore::tryToDelete(GCState & state, const Path & path)
throw GCLimitReached();
}
if (state.options.maxLinks) {
struct stat st;
if (stat(nixStore.c_str(), &st) == -1)
throw SysError(format("statting `%1%'") % nixStore);
if (st.st_nlink < state.options.maxLinks) {
printMsg(lvlInfo, format("link count on the store has dropped below %1%; stopping") % state.options.maxLinks);
throw GCLimitReached();
}
}
} else
printMsg(lvlTalkative, format("would delete `%1%'") % path);

View file

@ -466,7 +466,7 @@ void RemoteStore::collectGarbage(const GCOptions & options, GCResults & results)
writeStrings(options.pathsToDelete, to);
writeInt(options.ignoreLiveness, to);
writeLongLong(options.maxFreed, to);
writeInt(options.maxLinks, to);
writeInt(0, to);
if (GET_PROTOCOL_MINOR(daemonVersion) >= 5) {
/* removed options */
writeInt(0, to);

View file

@ -13,7 +13,6 @@ GCOptions::GCOptions()
action = gcDeleteDead;
ignoreLiveness = false;
maxFreed = 0;
maxLinks = 0;
}

View file

@ -53,10 +53,6 @@ struct GCOptions
no limit. */
unsigned long long maxFreed;
/* Stop after the number of hard links to the Nix store directory
has dropped below `maxLinks'. */
unsigned int maxLinks;
GCOptions();
};