diff options
| author | David S. Miller <davem@davemloft.net> | 2014-03-26 04:29:20 +0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-03-26 04:29:20 +0400 |
| commit | 04f58c88542b6b351efb4eea01134eb672e22e6e (patch) | |
| tree | 47bb617212f8c8951f35730e324bdc43487a01ca /fs/read_write.c | |
| parent | 0fc31966035d7a540c011b6c967ce8eae1db121b (diff) | |
| parent | 632b06aa2842b12c6d6a510ec080fb6ebdb38ea5 (diff) | |
| download | linux-04f58c88542b6b351efb4eea01134eb672e22e6e.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
Documentation/devicetree/bindings/net/micrel-ks8851.txt
net/core/netpoll.c
The net/core/netpoll.c conflict is a bug fix in 'net' happening
to code which is completely removed in 'net-next'.
In micrel-ks8851.txt we simply have overlapping changes.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'fs/read_write.c')
| -rw-r--r-- | fs/read_write.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/read_write.c b/fs/read_write.c index 54e19b9392dc..28cc9c810744 100644 --- a/fs/read_write.c +++ b/fs/read_write.c @@ -307,7 +307,7 @@ SYSCALL_DEFINE5(llseek, unsigned int, fd, unsigned long, offset_high, unsigned int, whence) { int retval; - struct fd f = fdget(fd); + struct fd f = fdget_pos(fd); loff_t offset; if (!f.file) @@ -327,7 +327,7 @@ SYSCALL_DEFINE5(llseek, unsigned int, fd, unsigned long, offset_high, retval = 0; } out_putf: - fdput(f); + fdput_pos(f); return retval; } #endif |