diff options
| author | Pavel Shilovsky <pshilovsky@samba.org> | 2012-06-20 03:21:16 -0400 |
|---|---|---|
| committer | Steve French <smfrench@gmail.com> | 2012-07-24 11:25:08 -0400 |
| commit | 6d5786a34d98bffb8ad50d8053d1e53231fe0636 (patch) | |
| tree | ae49860befc52cb18dfb2b86929878a204289601 /fs/cifs/ioctl.c | |
| parent | 2e6e02ab6ddbd539fd7e092973daf057adbd53dc (diff) | |
CIFS: Rename Get/FreeXid and make them work with unsigned int
Acked-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Pavel Shilovsky <pshilovsky@samba.org>
Signed-off-by: Steve French <smfrench@gmail.com>
Diffstat (limited to 'fs/cifs/ioctl.c')
| -rw-r--r-- | fs/cifs/ioctl.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/cifs/ioctl.c b/fs/cifs/ioctl.c index 6d2667f0c98c..ae082a66de2f 100644 --- a/fs/cifs/ioctl.c +++ b/fs/cifs/ioctl.c | |||
| @@ -34,7 +34,7 @@ long cifs_ioctl(struct file *filep, unsigned int command, unsigned long arg) | |||
| 34 | { | 34 | { |
| 35 | struct inode *inode = filep->f_dentry->d_inode; | 35 | struct inode *inode = filep->f_dentry->d_inode; |
| 36 | int rc = -ENOTTY; /* strange error - but the precedent */ | 36 | int rc = -ENOTTY; /* strange error - but the precedent */ |
| 37 | int xid; | 37 | unsigned int xid; |
| 38 | struct cifs_sb_info *cifs_sb; | 38 | struct cifs_sb_info *cifs_sb; |
| 39 | #ifdef CONFIG_CIFS_POSIX | 39 | #ifdef CONFIG_CIFS_POSIX |
| 40 | struct cifsFileInfo *pSMBFile = filep->private_data; | 40 | struct cifsFileInfo *pSMBFile = filep->private_data; |
| @@ -44,7 +44,7 @@ long cifs_ioctl(struct file *filep, unsigned int command, unsigned long arg) | |||
| 44 | __u64 caps; | 44 | __u64 caps; |
| 45 | #endif /* CONFIG_CIFS_POSIX */ | 45 | #endif /* CONFIG_CIFS_POSIX */ |
| 46 | 46 | ||
| 47 | xid = GetXid(); | 47 | xid = get_xid(); |
| 48 | 48 | ||
| 49 | cFYI(1, "ioctl file %p cmd %u arg %lu", filep, command, arg); | 49 | cFYI(1, "ioctl file %p cmd %u arg %lu", filep, command, arg); |
| 50 | 50 | ||
| @@ -105,6 +105,6 @@ long cifs_ioctl(struct file *filep, unsigned int command, unsigned long arg) | |||
| 105 | break; | 105 | break; |
| 106 | } | 106 | } |
| 107 | 107 | ||
| 108 | FreeXid(xid); | 108 | free_xid(xid); |
| 109 | return rc; | 109 | return rc; |
| 110 | } | 110 | } |