diff options
Diffstat (limited to 'fs/xfs/linux-2.6/xfs_file.c')
-rw-r--r-- | fs/xfs/linux-2.6/xfs_file.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/fs/xfs/linux-2.6/xfs_file.c b/fs/xfs/linux-2.6/xfs_file.c index d377db05d806..f999d20a429c 100644 --- a/fs/xfs/linux-2.6/xfs_file.c +++ b/fs/xfs/linux-2.6/xfs_file.c | |||
@@ -281,11 +281,8 @@ xfs_file_ioctl( | |||
281 | unsigned int cmd, | 281 | unsigned int cmd, |
282 | unsigned long p) | 282 | unsigned long p) |
283 | { | 283 | { |
284 | int error; | ||
285 | struct inode *inode = filp->f_path.dentry->d_inode; | 284 | struct inode *inode = filp->f_path.dentry->d_inode; |
286 | 285 | ||
287 | error = xfs_ioctl(XFS_I(inode), filp, 0, cmd, (void __user *)p); | ||
288 | xfs_iflags_set(XFS_I(inode), XFS_IMODIFIED); | ||
289 | 286 | ||
290 | /* NOTE: some of the ioctl's return positive #'s as a | 287 | /* NOTE: some of the ioctl's return positive #'s as a |
291 | * byte count indicating success, such as | 288 | * byte count indicating success, such as |
@@ -293,7 +290,7 @@ xfs_file_ioctl( | |||
293 | * like most other routines. This means true | 290 | * like most other routines. This means true |
294 | * errors need to be returned as a negative value. | 291 | * errors need to be returned as a negative value. |
295 | */ | 292 | */ |
296 | return error; | 293 | return xfs_ioctl(XFS_I(inode), filp, 0, cmd, (void __user *)p); |
297 | } | 294 | } |
298 | 295 | ||
299 | STATIC long | 296 | STATIC long |
@@ -302,11 +299,8 @@ xfs_file_ioctl_invis( | |||
302 | unsigned int cmd, | 299 | unsigned int cmd, |
303 | unsigned long p) | 300 | unsigned long p) |
304 | { | 301 | { |
305 | int error; | ||
306 | struct inode *inode = filp->f_path.dentry->d_inode; | 302 | struct inode *inode = filp->f_path.dentry->d_inode; |
307 | 303 | ||
308 | error = xfs_ioctl(XFS_I(inode), filp, IO_INVIS, cmd, (void __user *)p); | ||
309 | xfs_iflags_set(XFS_I(inode), XFS_IMODIFIED); | ||
310 | 304 | ||
311 | /* NOTE: some of the ioctl's return positive #'s as a | 305 | /* NOTE: some of the ioctl's return positive #'s as a |
312 | * byte count indicating success, such as | 306 | * byte count indicating success, such as |
@@ -314,7 +308,7 @@ xfs_file_ioctl_invis( | |||
314 | * like most other routines. This means true | 308 | * like most other routines. This means true |
315 | * errors need to be returned as a negative value. | 309 | * errors need to be returned as a negative value. |
316 | */ | 310 | */ |
317 | return error; | 311 | return xfs_ioctl(XFS_I(inode), filp, IO_INVIS, cmd, (void __user *)p); |
318 | } | 312 | } |
319 | 313 | ||
320 | /* | 314 | /* |