diff options
| author | Jeff Layton <jlayton@primarydata.com> | 2014-08-22 11:27:32 -0400 |
|---|---|---|
| committer | Jeff Layton <jlayton@primarydata.com> | 2014-09-09 16:01:36 -0400 |
| commit | e0b93eddfe17dcb7d644eb5d6ad02a86fc41a977 (patch) | |
| tree | 97ceab83fdbfd3bf54fd8235a66da665fbcc83a7 /fs/notify | |
| parent | 1c994a0909a556508c2cc26ab5d9e13c5ce33aa0 (diff) | |
| download | linux-e0b93eddfe17dcb7d644eb5d6ad02a86fc41a977.tar.bz2 | |
security: make security_file_set_fowner, f_setown and __f_setown void return
security_file_set_fowner always returns 0, so make it f_setown and
__f_setown void return functions and fix up the error handling in the
callers.
Cc: linux-security-module@vger.kernel.org
Signed-off-by: Jeff Layton <jlayton@primarydata.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Diffstat (limited to 'fs/notify')
| -rw-r--r-- | fs/notify/dnotify/dnotify.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/fs/notify/dnotify/dnotify.c b/fs/notify/dnotify/dnotify.c index abc8cbcfe90e..caaaf9dfe353 100644 --- a/fs/notify/dnotify/dnotify.c +++ b/fs/notify/dnotify/dnotify.c @@ -346,13 +346,7 @@ int fcntl_dirnotify(int fd, struct file *filp, unsigned long arg) goto out; } - error = __f_setown(filp, task_pid(current), PIDTYPE_PID, 0); - if (error) { - /* if we added, we must shoot */ - if (dn_mark == new_dn_mark) - destroy = 1; - goto out; - } + __f_setown(filp, task_pid(current), PIDTYPE_PID, 0); error = attach_dn(dn, dn_mark, id, fd, filp, mask); /* !error means that we attached the dn to the dn_mark, so don't free it */ |