提交 76b74e19 编写于 作者: sangshuduo's avatar sangshuduo

[TD-71] revised to avoid double close when fd is 0.

上级 cccb8f19
...@@ -413,7 +413,7 @@ void vnodeRemoveFile(int vnode, int fileId) { ...@@ -413,7 +413,7 @@ void vnodeRemoveFile(int vnode, int fileId) {
vnodeGetDnameFromLname(headName, dataName, lastName, dHeadName, dDataName, dLastName); vnodeGetDnameFromLname(headName, dataName, lastName, dHeadName, dDataName, dLastName);
int fd = open(headName, O_RDWR | O_CREAT, S_IRWXU | S_IRWXG | S_IRWXO); int fd = open(headName, O_RDWR | O_CREAT, S_IRWXU | S_IRWXG | S_IRWXO);
if (fd > 0) { if (fd >= 0) {
vnodeGetHeadFileHeaderInfo(fd, &headInfo); vnodeGetHeadFileHeaderInfo(fd, &headInfo);
atomic_fetch_add_64(&(pVnode->vnodeStatistic.totalStorage), -headInfo.totalStorage); atomic_fetch_add_64(&(pVnode->vnodeStatistic.totalStorage), -headInfo.totalStorage);
close(fd); close(fd);
...@@ -428,7 +428,6 @@ void vnodeRemoveFile(int vnode, int fileId) { ...@@ -428,7 +428,6 @@ void vnodeRemoveFile(int vnode, int fileId) {
dPrint("vid:%d fileId:%d on disk: %s is removed, numOfFiles:%d maxFiles:%d", vnode, fileId, path, dPrint("vid:%d fileId:%d on disk: %s is removed, numOfFiles:%d maxFiles:%d", vnode, fileId, path,
pVnode->numOfFiles, pVnode->maxFiles); pVnode->numOfFiles, pVnode->maxFiles);
close(fd);
} }
void vnodeCloseCommitFiles(SVnodeObj *pVnode) { void vnodeCloseCommitFiles(SVnodeObj *pVnode) {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册