diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-13 01:34:18 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-13 01:34:18 -0500 |
commit | 9bc9ccd7db1c9f043f75380b5a5b94912046a60e (patch) | |
tree | dd0a1b3396ae9414f668b0110cc39d11268ad3ed /drivers/char | |
parent | f0230294271f511b41797305b685365a9e569a09 (diff) | |
parent | bdd3536618443809d18868563eeafa63b9d29603 (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull vfs updates from Al Viro:
"All kinds of stuff this time around; some more notable parts:
- RCU'd vfsmounts handling
- new primitives for coredump handling
- files_lock is gone
- Bruce's delegations handling series
- exportfs fixes
plus misc stuff all over the place"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: (101 commits)
ecryptfs: ->f_op is never NULL
locks: break delegations on any attribute modification
locks: break delegations on link
locks: break delegations on rename
locks: helper functions for delegation breaking
locks: break delegations on unlink
namei: minor vfs_unlink cleanup
locks: implement delegations
locks: introduce new FL_DELEG lock flag
vfs: take i_mutex on renamed file
vfs: rename I_MUTEX_QUOTA now that it's not used for quotas
vfs: don't use PARENT/CHILD lock classes for non-directories
vfs: pull ext4's double-i_mutex-locking into common code
exportfs: fix quadratic behavior in filehandle lookup
exportfs: better variable name
exportfs: move most of reconnect_path to helper function
exportfs: eliminate unused "noprogress" counter
exportfs: stop retrying once we race with rename/remove
exportfs: clear DISCONNECTED on all parents sooner
exportfs: more detailed comment for path_reconnect
...
Diffstat (limited to 'drivers/char')
-rw-r--r-- | drivers/char/misc.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/drivers/char/misc.c b/drivers/char/misc.c index 2f685f6eda48..ffa97d261cf3 100644 --- a/drivers/char/misc.c +++ b/drivers/char/misc.c | |||
@@ -114,7 +114,7 @@ static int misc_open(struct inode * inode, struct file * file) | |||
114 | int minor = iminor(inode); | 114 | int minor = iminor(inode); |
115 | struct miscdevice *c; | 115 | struct miscdevice *c; |
116 | int err = -ENODEV; | 116 | int err = -ENODEV; |
117 | const struct file_operations *old_fops, *new_fops = NULL; | 117 | const struct file_operations *new_fops = NULL; |
118 | 118 | ||
119 | mutex_lock(&misc_mtx); | 119 | mutex_lock(&misc_mtx); |
120 | 120 | ||
@@ -141,17 +141,11 @@ static int misc_open(struct inode * inode, struct file * file) | |||
141 | } | 141 | } |
142 | 142 | ||
143 | err = 0; | 143 | err = 0; |
144 | old_fops = file->f_op; | 144 | replace_fops(file, new_fops); |
145 | file->f_op = new_fops; | ||
146 | if (file->f_op->open) { | 145 | if (file->f_op->open) { |
147 | file->private_data = c; | 146 | file->private_data = c; |
148 | err=file->f_op->open(inode,file); | 147 | err = file->f_op->open(inode,file); |
149 | if (err) { | ||
150 | fops_put(file->f_op); | ||
151 | file->f_op = fops_get(old_fops); | ||
152 | } | ||
153 | } | 148 | } |
154 | fops_put(old_fops); | ||
155 | fail: | 149 | fail: |
156 | mutex_unlock(&misc_mtx); | 150 | mutex_unlock(&misc_mtx); |
157 | return err; | 151 | return err; |