path: root/fs
diff options
authorLinus Torvalds <torvalds@linux-foundation.org>2011-08-06 11:51:33 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-08-06 11:51:33 -0700
commit1117f72ea0217ba0cc19f05adbbd8b9a397f5ab7 (patch)
tree26acc637b57fb4ac6b965fd8fb4b7249aaec8755 /fs
parentc21427043dec93d40e3a1af970831d1f5f15ce5d (diff)
vfs: show O_CLOEXE bit properly in /proc/<pid>/fdinfo/<fd> files
The CLOEXE bit is magical, and for performance (and semantic) reasons we don't actually maintain it in the file descriptor itself, but in a separate bit array. Which means that when we show f_flags, the CLOEXE status is shown incorrectly: we show the status not as it is now, but as it was when the file was opened. Fix that by looking up the bit properly in the 'fdt->close_on_exec' bit array. Uli needs this in order to re-implement the pfiles program: "For normal file descriptors (not sockets) this was the last piece of information which wasn't available. This is all part of my 'give Solaris users no reason to not switch' effort. I intend to offer the code to the util-linux-ng maintainers." Requested-by: Ulrich Drepper <drepper@akkadia.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs')
1 files changed, 9 insertions, 1 deletions
diff --git a/fs/proc/base.c b/fs/proc/base.c
index 73a562bf726..5eb02069e1b 100644
--- a/fs/proc/base.c
+++ b/fs/proc/base.c
@@ -1919,6 +1919,14 @@ static int proc_fd_info(struct inode *inode, struct path *path, char *info)
file = fcheck_files(files, fd);
if (file) {
+ unsigned int f_flags;
+ struct fdtable *fdt;
+ fdt = files_fdtable(files);
+ f_flags = file->f_flags & ~O_CLOEXEC;
+ if (FD_ISSET(fd, fdt->close_on_exec))
+ f_flags |= O_CLOEXEC;
if (path) {
*path = file->f_path;
@@ -1928,7 +1936,7 @@ static int proc_fd_info(struct inode *inode, struct path *path, char *info)
(long long) file->f_pos,
- file->f_flags);
+ f_flags);
return 0;