diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-24 11:01:10 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-24 11:01:10 -0400 |
| commit | f13771187b9423b824f32518319f6da85d819003 (patch) | |
| tree | c431cf16c286065a302d5f3fb43fc1abac7e4047 /include | |
| parent | 15953654cc312429740fd58fb37a5a3d63a54376 (diff) | |
| parent | 9f37af654fda88a8dcca74c785f6c20e52758866 (diff) | |
Merge branch 'bkl/ioctl' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing
* 'bkl/ioctl' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing:
uml: Pushdown the bkl from harddog_kern ioctl
sunrpc: Pushdown the bkl from sunrpc cache ioctl
sunrpc: Pushdown the bkl from ioctl
autofs4: Pushdown the bkl from ioctl
uml: Convert to unlocked_ioctls to remove implicit BKL
ncpfs: BKL ioctl pushdown
coda: Clean-up whitespace problems in pioctl.c
coda: BKL ioctl pushdown
drivers: Push down BKL into various drivers
isdn: Push down BKL into ioctl functions
scsi: Push down BKL into ioctl functions
dvb: Push down BKL into ioctl functions
smbfs: Push down BKL into ioctl function
coda/psdev: Remove BKL from ioctl function
um/mmapper: Remove BKL usage
sn_hwperf: Kill BKL usage
hfsplus: Push down BKL into ioctl function
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/ncp_fs.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/ncp_fs.h b/include/linux/ncp_fs.h index 30b06c893944..4522aed00906 100644 --- a/include/linux/ncp_fs.h +++ b/include/linux/ncp_fs.h | |||
| @@ -210,7 +210,7 @@ int ncp_date_dos2unix(__le16 time, __le16 date); | |||
| 210 | void ncp_date_unix2dos(int unix_date, __le16 * time, __le16 * date); | 210 | void ncp_date_unix2dos(int unix_date, __le16 * time, __le16 * date); |
| 211 | 211 | ||
| 212 | /* linux/fs/ncpfs/ioctl.c */ | 212 | /* linux/fs/ncpfs/ioctl.c */ |
| 213 | int ncp_ioctl(struct inode *, struct file *, unsigned int, unsigned long); | 213 | long ncp_ioctl(struct file *, unsigned int, unsigned long); |
| 214 | long ncp_compat_ioctl(struct file *, unsigned int, unsigned long); | 214 | long ncp_compat_ioctl(struct file *, unsigned int, unsigned long); |
| 215 | 215 | ||
| 216 | /* linux/fs/ncpfs/sock.c */ | 216 | /* linux/fs/ncpfs/sock.c */ |