forked from luck/tmp_suning_uos_patched
dlm fixes for 4.8
This fixes a bug introduced by recent debugfs cleanup. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAABAgAGBQJXwJgQAAoJEDgbc8f8gGmqTQcP/1XKsslqYcg9e4xcx3ZAyT3l HTzRbygNmIzgIsLxDk4AvlvfrUOMFj/rJwBH/gvM68wD5cUHaTrdTN9riOWaJLFh J+EgkMYmKAoYvk3wyvAKbeYACOAB8BjTOLLN7zdEEDCVBMG4A+zq7B54xg3J15bU o60XLNnA34m4YPCh+LpGODckek++lKnsNzI/x0H7EQoMMU9Rm7WgVk+gictmnZlT Ms8zfE8dy1UPuGUyYN5YGGXoCasNN6FQc3MVLbTYCmw8qPwIa2hdMYjm8er329gL bvqp350ElogABbTGrgzN/cmrKJt6k3Y2i2ECs4G7aYBXkFhWJKXIdhPnu5ajiiRG DUwnPSqCgFXSDKU/X1Ev3Ro1IgdqZJx18PFgljW2PCPTDx79jCaMJjHgEtK+Q5mu VyeEiyXwhRPaFU4Sfc2Tul75ylI0SashufTRHSo80qfobCnhnByYTyOb8/MuCAsM v8fcgbSaHBktpiZIMOn9ZOcsaXQ/wkciqr5JKqnVO69F/m2dbz5SX6ySew0y+DSA 6ZpU9H6VIXKzsd1NCLsUTgyJE5L649nE9T0CzbzBUWYj1EzC+lk/DLu+gzxVuj3M T0SDmU0d441qECOsxtyUgkBUOfqKoHQis5WZyU++cXxV9vapBR+s+NFAJjc3MmT+ iiKm1Qg6nD5BQr8EM8i6 =9igI -----END PGP SIGNATURE----- Merge tag 'dlm-4.8-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm Pull dlm fix from David Teigland: "This fixes a bug introduced by recent debugfs cleanup" * tag 'dlm-4.8-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm: dlm: fix malfunction of dlm_tool caused by debugfs changes
This commit is contained in:
commit
370f601729
@ -607,20 +607,54 @@ static const struct file_operations format2_fops;
|
||||
static const struct file_operations format3_fops;
|
||||
static const struct file_operations format4_fops;
|
||||
|
||||
static int table_open(struct inode *inode, struct file *file)
|
||||
static int table_open1(struct inode *inode, struct file *file)
|
||||
{
|
||||
struct seq_file *seq;
|
||||
int ret = -1;
|
||||
int ret;
|
||||
|
||||
if (file->f_op == &format1_fops)
|
||||
ret = seq_open(file, &format1_seq_ops);
|
||||
else if (file->f_op == &format2_fops)
|
||||
ret = seq_open(file, &format2_seq_ops);
|
||||
else if (file->f_op == &format3_fops)
|
||||
ret = seq_open(file, &format3_seq_ops);
|
||||
else if (file->f_op == &format4_fops)
|
||||
ret = seq_open(file, &format4_seq_ops);
|
||||
ret = seq_open(file, &format1_seq_ops);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
seq = file->private_data;
|
||||
seq->private = inode->i_private; /* the dlm_ls */
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int table_open2(struct inode *inode, struct file *file)
|
||||
{
|
||||
struct seq_file *seq;
|
||||
int ret;
|
||||
|
||||
ret = seq_open(file, &format2_seq_ops);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
seq = file->private_data;
|
||||
seq->private = inode->i_private; /* the dlm_ls */
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int table_open3(struct inode *inode, struct file *file)
|
||||
{
|
||||
struct seq_file *seq;
|
||||
int ret;
|
||||
|
||||
ret = seq_open(file, &format3_seq_ops);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
seq = file->private_data;
|
||||
seq->private = inode->i_private; /* the dlm_ls */
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int table_open4(struct inode *inode, struct file *file)
|
||||
{
|
||||
struct seq_file *seq;
|
||||
int ret;
|
||||
|
||||
ret = seq_open(file, &format4_seq_ops);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
@ -631,7 +665,7 @@ static int table_open(struct inode *inode, struct file *file)
|
||||
|
||||
static const struct file_operations format1_fops = {
|
||||
.owner = THIS_MODULE,
|
||||
.open = table_open,
|
||||
.open = table_open1,
|
||||
.read = seq_read,
|
||||
.llseek = seq_lseek,
|
||||
.release = seq_release
|
||||
@ -639,7 +673,7 @@ static const struct file_operations format1_fops = {
|
||||
|
||||
static const struct file_operations format2_fops = {
|
||||
.owner = THIS_MODULE,
|
||||
.open = table_open,
|
||||
.open = table_open2,
|
||||
.read = seq_read,
|
||||
.llseek = seq_lseek,
|
||||
.release = seq_release
|
||||
@ -647,7 +681,7 @@ static const struct file_operations format2_fops = {
|
||||
|
||||
static const struct file_operations format3_fops = {
|
||||
.owner = THIS_MODULE,
|
||||
.open = table_open,
|
||||
.open = table_open3,
|
||||
.read = seq_read,
|
||||
.llseek = seq_lseek,
|
||||
.release = seq_release
|
||||
@ -655,7 +689,7 @@ static const struct file_operations format3_fops = {
|
||||
|
||||
static const struct file_operations format4_fops = {
|
||||
.owner = THIS_MODULE,
|
||||
.open = table_open,
|
||||
.open = table_open4,
|
||||
.read = seq_read,
|
||||
.llseek = seq_lseek,
|
||||
.release = seq_release
|
||||
|
Loading…
Reference in New Issue
Block a user