git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fsnotify: Remove unnecessary tests when showing fdinfo
[sfrench/cifs-2.6.git]
/
fs
/
notify
/
fdinfo.c
diff --git
a/fs/notify/fdinfo.c
b/fs/notify/fdinfo.c
index fd98e5100cabedaa2a71ecef4bd8997334ae528e..601a59c8d87e21e56fff95f8797aee5260de421a 100644
(file)
--- a/
fs/notify/fdinfo.c
+++ b/
fs/notify/fdinfo.c
@@
-76,8
+76,7
@@
static void inotify_fdinfo(struct seq_file *m, struct fsnotify_mark *mark)
struct inotify_inode_mark *inode_mark;
struct inode *inode;
struct inotify_inode_mark *inode_mark;
struct inode *inode;
- if (!(mark->flags & FSNOTIFY_MARK_FLAG_ALIVE) ||
- !(mark->flags & FSNOTIFY_MARK_FLAG_INODE))
+ if (!(mark->flags & FSNOTIFY_MARK_FLAG_INODE))
return;
inode_mark = container_of(mark, struct inotify_inode_mark, fsn_mark);
return;
inode_mark = container_of(mark, struct inotify_inode_mark, fsn_mark);
@@
-113,9
+112,6
@@
static void fanotify_fdinfo(struct seq_file *m, struct fsnotify_mark *mark)
unsigned int mflags = 0;
struct inode *inode;
unsigned int mflags = 0;
struct inode *inode;
- if (!(mark->flags & FSNOTIFY_MARK_FLAG_ALIVE))
- return;
-
if (mark->flags & FSNOTIFY_MARK_FLAG_IGNORED_SURV_MODIFY)
mflags |= FAN_MARK_IGNORED_SURV_MODIFY;
if (mark->flags & FSNOTIFY_MARK_FLAG_IGNORED_SURV_MODIFY)
mflags |= FAN_MARK_IGNORED_SURV_MODIFY;