diff options
| author |   Arnd Bergmann <arnd@arndb.de> | 2012-07-12 17:27:36 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-07-12 17:27:36 +0200 |
| commit | 35bf8cc74b2b1dfad18df6d330b271e68ab6e3f5 (patch) | |
| tree | adf37371beb73adbb0d2414a52d86580dd37d2e0 /fs/open.c | |
| parent | Merge tag 'omap-devel-dmtimer-for-v3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/timer (diff) | |
| parent | clocksource: dw_apb_timer: Add common DTS glue for dw_apb_timer (diff) | |
| download | wireguard-linux-35bf8cc74b2b1dfad18df6d330b271e68ab6e3f5.tar.xz wireguard-linux-35bf8cc74b2b1dfad18df6d330b271e68ab6e3f5.zip | |
Merge branch 'picoxcell/timer' into next/timer
Imported from mailing list
* picoxcell/timer:
clocksource: dw_apb_timer: Add common DTS glue for dw_apb_timer
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'fs/open.c')
| -rw-r--r-- | fs/open.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/open.c b/fs/open.c index d6c79a0dffc7..1540632d8387 100644 --- a/fs/open.c +++ b/fs/open.c @@ -397,10 +397,10 @@ SYSCALL_DEFINE1(fchdir, unsigned int, fd) { struct file *file; struct inode *inode; - int error; + int error, fput_needed; error = -EBADF; - file = fget(fd); + file = fget_raw_light(fd, &fput_needed); if (!file) goto out; @@ -414,7 +414,7 @@ SYSCALL_DEFINE1(fchdir, unsigned int, fd) if (!error) set_fs_pwd(current->fs, &file->f_path); out_putf: - fput(file); + fput_light(file, fput_needed); out: return error; } |