Commit 33ea2f52 authored by Robert Love's avatar Robert Love Committed by Linus Torvalds

[PATCH] inotify: use fget_light

As an optimization, use fget_light() and fput_light() where possible.
Signed-off-by: default avatarRobert Love <rml@novell.com>
Signed-off-by: default avatarJohn McCutchan <ttb@tentacle.dhs.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent b680716e
...@@ -923,10 +923,10 @@ asmlinkage long sys_inotify_add_watch(int fd, const char __user *path, u32 mask) ...@@ -923,10 +923,10 @@ asmlinkage long sys_inotify_add_watch(int fd, const char __user *path, u32 mask)
struct inotify_device *dev; struct inotify_device *dev;
struct nameidata nd; struct nameidata nd;
struct file *filp; struct file *filp;
int ret; int ret, fput_needed;
filp = fget(fd); filp = fget_light(fd, &fput_needed);
if (!filp) if (unlikely(!filp))
return -EBADF; return -EBADF;
ret = find_inode(path, &nd); ret = find_inode(path, &nd);
...@@ -973,7 +973,7 @@ asmlinkage long sys_inotify_add_watch(int fd, const char __user *path, u32 mask) ...@@ -973,7 +973,7 @@ asmlinkage long sys_inotify_add_watch(int fd, const char __user *path, u32 mask)
up(&dev->sem); up(&dev->sem);
up(&inode->inotify_sem); up(&inode->inotify_sem);
fput_and_out: fput_and_out:
fput(filp); fput_light(filp, fput_needed);
return ret; return ret;
} }
...@@ -981,14 +981,14 @@ asmlinkage long sys_inotify_rm_watch(int fd, u32 wd) ...@@ -981,14 +981,14 @@ asmlinkage long sys_inotify_rm_watch(int fd, u32 wd)
{ {
struct file *filp; struct file *filp;
struct inotify_device *dev; struct inotify_device *dev;
int ret; int ret, fput_needed;
filp = fget(fd); filp = fget_light(fd, &fput_needed);
if (!filp) if (unlikely(!filp))
return -EBADF; return -EBADF;
dev = filp->private_data; dev = filp->private_data;
ret = inotify_ignore(dev, wd); ret = inotify_ignore(dev, wd);
fput(filp); fput_light(filp, fput_needed);
return ret; return ret;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment