Skip to content

Add lsof Support to Identify Open-but-Deleted NFS Files (ESTALE / “St… #344

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
x-lugoo wants to merge 1 commit into
base: master
Choose a base branch
from
+22 −5
Open

Add lsof Support to Identify Open-but-Deleted NFS Files (ESTALE / “St… #344

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions Lsof.8
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1302,6 +1302,10 @@ It is also useful when host name lookup is not working properly.
.B \-N
selects the listing of NFS files.
.TP \w'names'u+4
.B \-y
selects the listing of files whose stat(2)/lstat(2) fails with
ESTALE ("Stale file handle"), e.g., stale NFS file handles.
.TP \w'names'u+4
.BI \-o
directs
.I lsof
Expand Down
5 changes: 3 additions & 2 deletions lib/common.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -569,14 +569,15 @@ extern int ZoneColW;
# define SELEVTFDINFO \
0x200000 /* selected for evetnfd info; \
* cleared in link_lfile() */
# define SELSTALE 0x400000 /* select files with ESTALE (stale file handle) */

# define SELALL \
(SELCMD | SELCNTX | SELFD | SELNA | SELNET | SELNM | SELNFS | SELPID | \
SELUID | SELUNX | SELZONE | SELTASK)
SELUID | SELUNX | SELZONE | SELTASK | SELSTALE)
# define SELPROC \
(SELCMD | SELCNTX | SELPGID | SELPID | SELUID | SELZONE | SELTASK)
/* process selecters */
# define SELFILE (SELFD | SELNFS | SELNLINK | SELNM) /* file selecters */
# define SELFILE (SELFD | SELNFS | SELNLINK | SELNM | SELSTALE) /* file selecters */
# define SELNW (SELNA | SELNET | SELUNX) /* network selecters */

/*
Expand Down
10 changes: 9 additions & 1 deletion lib/dialects/linux/dproc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -917,6 +917,8 @@ static int process_id(struct lsof_context *ctx, /* context */
static int pathil = 0;
char *rest;
int txts = 0;
int enss_fd = 0;
int enls_fd = 0;

#if defined(HASSELINUX)
cntxlist_t *cntxp;
Expand Down Expand Up @@ -1206,13 +1208,15 @@ static int process_id(struct lsof_context *ctx, /* context */
} else {
if (HasNFS) {
if (lstatsafely(ctx, path, &lsb)) {
enls_fd = errno;
(void)statEx(ctx, pbuf, &lsb, &ls);
enls = errno;
} else {
enls = 0;
ls = SB_ALL;
}
if (statsafely(ctx, path, &sb)) {
enss_fd = errno;
(void)statEx(ctx, pbuf, &sb, &ss);
enss = errno;
} else {
Expand Down Expand Up @@ -1352,7 +1356,11 @@ static int process_id(struct lsof_context *ctx, /* context */
"[pidfd:%d]", fi.pid);
enter_nm(ctx, rest);
}

if ((Selflags & SELSTALE) &&
(enss_fd == ESTALE || enls_fd == ESTALE)) {
Lf->sf |= SELSTALE;
(void)add_nma(ctx, " (STALE)", 8);
}
if (Lf->sf)
link_lfile(ctx);
}
Expand Down
5 changes: 4 additions & 1 deletion src/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ int main(int argc, char *argv[]) {
* Create option mask.
*/
(void)snpf(options, sizeof(options),
"?a%sbc:%sD:d:%s%sf:F:g:hHi:%s%slL:%s%snNo:Op:QPr:%ss:S:tT:u:"
"?a%sbc:%sD:d:%s%sf:F:g:hHi:%s%slL:%s%snNyo:Op:QPr:%ss:S:tT:u:"
"UvVwx:%s%s%s",

#if defined(HAS_AFS) && defined(HASAOPT)
Expand Down Expand Up @@ -700,6 +700,9 @@ int main(int argc, char *argv[]) {
case 'N':
Fnfs = 1;
break;
case 'y':
Selflags |= SELSTALE;
break;
case 'o':
if (!GOv || *GOv == '-' || *GOv == '+') {
Foffset = 1;
Expand Down
3 changes: 2 additions & 1 deletion src/usage.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,7 @@ void usage(struct lsof_context *ctx, /* context */
(void)fprintf(stderr, " latest FAQ: %s\n", LSOF_FAQ_URL);
(void)fprintf(stderr, " latest (non-formatted) man page: %s\n",
LSOF_MAN_URL);
(void)fprintf(stderr, " usage: [-?ab%shH%slnNoOP%s%stUvV%s]",
(void)fprintf(stderr, " usage: [-?ab%shH%slnNoyOP%s%stUvV%s]",

#if defined(HASNCACHE)
"C",
Expand Down Expand Up @@ -513,6 +513,7 @@ void usage(struct lsof_context *ctx, /* context */
col = print_in_col(col, "-l list UID numbers");
col = print_in_col(col, "-n no host names");
col = print_in_col(col, "-N select NFS files");
col = print_in_col(col, "-y select stale file handles (ESTALE)");
col = print_in_col(col, "-o list file offset");
col = print_in_col(col, "-O no overhead *RISKY*");
col = print_in_col(col, "-P no port names");
Expand Down