diff options
Diffstat (limited to 'fs/xfs/linux-2.6')
-rw-r--r-- | fs/xfs/linux-2.6/xfs_cred.h | 4 | ||||
-rw-r--r-- | fs/xfs/linux-2.6/xfs_ioctl.c | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/fs/xfs/linux-2.6/xfs_cred.h b/fs/xfs/linux-2.6/xfs_cred.h index e279d00779f4..55bddf3b6091 100644 --- a/fs/xfs/linux-2.6/xfs_cred.h +++ b/fs/xfs/linux-2.6/xfs_cred.h | |||
@@ -23,8 +23,6 @@ | |||
23 | /* | 23 | /* |
24 | * Credentials | 24 | * Credentials |
25 | */ | 25 | */ |
26 | typedef struct cred { | 26 | typedef const struct cred cred_t; |
27 | /* EMPTY */ | ||
28 | } cred_t; | ||
29 | 27 | ||
30 | #endif /* __XFS_CRED_H__ */ | 28 | #endif /* __XFS_CRED_H__ */ |
diff --git a/fs/xfs/linux-2.6/xfs_ioctl.c b/fs/xfs/linux-2.6/xfs_ioctl.c index 0264c8719ffd..67205f6198ba 100644 --- a/fs/xfs/linux-2.6/xfs_ioctl.c +++ b/fs/xfs/linux-2.6/xfs_ioctl.c | |||
@@ -252,6 +252,7 @@ xfs_open_by_handle( | |||
252 | struct file *parfilp, | 252 | struct file *parfilp, |
253 | struct inode *parinode) | 253 | struct inode *parinode) |
254 | { | 254 | { |
255 | const struct cred *cred = current_cred(); | ||
255 | int error; | 256 | int error; |
256 | int new_fd; | 257 | int new_fd; |
257 | int permflag; | 258 | int permflag; |
@@ -314,7 +315,7 @@ xfs_open_by_handle( | |||
314 | mntget(parfilp->f_path.mnt); | 315 | mntget(parfilp->f_path.mnt); |
315 | 316 | ||
316 | /* Create file pointer. */ | 317 | /* Create file pointer. */ |
317 | filp = dentry_open(dentry, parfilp->f_path.mnt, hreq->oflags); | 318 | filp = dentry_open(dentry, parfilp->f_path.mnt, hreq->oflags, cred); |
318 | if (IS_ERR(filp)) { | 319 | if (IS_ERR(filp)) { |
319 | put_unused_fd(new_fd); | 320 | put_unused_fd(new_fd); |
320 | return -XFS_ERROR(-PTR_ERR(filp)); | 321 | return -XFS_ERROR(-PTR_ERR(filp)); |