summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2016-01-19 20:00:26 +0300
committerMike Marshall <hubcap@omnibond.com>2016-01-23 20:42:43 +0300
commitfb6d2526e92e56d3f41bfec45daf1ce09dd59e7b (patch)
tree17e9c6111e44fa530d79aee519339cfcb6be966a
parent3e1dd9aa8228cdbbf604006b179efc9312001fb3 (diff)
downloadlinux-fb6d2526e92e56d3f41bfec45daf1ce09dd59e7b.tar.xz
orangefs: generic_file_open() is pointless for character devices
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Mike Marshall <hubcap@omnibond.com>
-rw-r--r--fs/orangefs/devorangefs-req.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/fs/orangefs/devorangefs-req.c b/fs/orangefs/devorangefs-req.c
index 5da5ef616b85..fb7f092f94ba 100644
--- a/fs/orangefs/devorangefs-req.c
+++ b/fs/orangefs/devorangefs-req.c
@@ -85,9 +85,8 @@ static int orangefs_devreq_open(struct inode *inode, struct file *file)
mutex_lock(&devreq_mutex);
if (open_access_count == 0) {
- ret = generic_file_open(inode, file);
- if (ret == 0)
- open_access_count++;
+ open_access_count++;
+ ret = 0;
} else {
DUMP_DEVICE_ERROR();
}