RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-04-01 23:02:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

os/LFNIndex: remove alt xattr after unlink

Browse Source 
After we unlink, if the nlink on the inode is still non-zero, remove the
alt xattr.  We can *only* do this after the rename or unlink operation
because we don't want to leave a file system link in place without the
matching xattr; hence the fsync_dir() call.

Note that this might leak an alt xattr if we happen to fail after the
rename/unlink but before the removexattr is committed.  We'll fix that
next.

Signed-off-by: Sage Weil <sage@redhat.com>
This commit is contained in:
Sage Weil 2014-07-18 17:28:18 -07:00
parent a320c260a9
commit ec36f0a130
1 changed files with 15 additions and 3 deletions

18
src/os/LFNIndex.cc
View File

@ -883,15 +883,19 @@ int LFNIndex::lfn_unlink(const vector<string> &path,
} }
} }
} }
string full_path = get_full_path(path, mangled_name);
int fd = ::open(full_path.c_str(), O_RDONLY);
if (fd < 0)
return -errno;
FDCloser f(fd);
if (i == removed_index + 1) { if (i == removed_index + 1) {
string full_path = get_full_path(path, mangled_name);
maybe_inject_failure(); maybe_inject_failure();
int r = ::unlink(full_path.c_str()); int r = ::unlink(full_path.c_str());
maybe_inject_failure(); maybe_inject_failure();
if (r < 0) if (r < 0)
return -errno; return -errno;
} else { } else {
string rename_to = get_full_path(path, mangled_name); string& rename_to = full_path;
string rename_from = get_full_path(path, lfn_get_short_name(oid, i - 1)); string rename_from = get_full_path(path, lfn_get_short_name(oid, i - 1));
maybe_inject_failure(); maybe_inject_failure();
int r = ::rename(rename_from.c_str(), rename_to.c_str()); int r = ::rename(rename_from.c_str(), rename_to.c_str());
@ -899,7 +903,15 @@ int LFNIndex::lfn_unlink(const vector<string> &path,
if (r < 0) if (r < 0)
return -errno; return -errno;
} }
return 0; struct stat st;
int r = ::fstat(fd, &st);
if (r == 0 && st.st_nlink > 0) {
// remove alt attr
dout(20) << __func__ << " removing alt attr from " << full_path << dendl;
fsync_dir(path);
chain_fremovexattr(fd, get_alt_lfn_attr().c_str());
}
return r;
} }
int LFNIndex::lfn_translate(const vector<string> &path, int LFNIndex::lfn_translate(const vector<string> &path,