xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[XFS] Fix merge failures

Browse Source 
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:

	fs/xfs/linux-2.6/xfs_cred.h
	fs/xfs/linux-2.6/xfs_globals.h
	fs/xfs/linux-2.6/xfs_ioctl.c
	fs/xfs/xfs_vnodeops.h

Signed-off-by: Lachlan McIlroy <lachlan@sgi.com>
This commit is contained in:
Lachlan McIlroy
2008-12-29 16:47:18 +11:00
parent 25051158bb 3c92ec8ae9
commit 0a8c5395f9
2880 changed files with 144424 additions and 81686 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
fs/xfs/linux-2.6/xfs_ioctl.c
View File

@@ -252,6 +252,7 @@ xfs_open_by_handle(
struct file *parfilp,
struct inode *parinode)
{
const struct cred *cred = current_cred();
int error;
int new_fd;
int permflag;
@@ -314,7 +315,7 @@ xfs_open_by_handle(
mntget(parfilp->f_path.mnt);
/* Create file pointer. */
filp = dentry_open(dentry, parfilp->f_path.mnt, hreq->oflags);
filp = dentry_open(dentry, parfilp->f_path.mnt, hreq->oflags, cred);
if (IS_ERR(filp)) {
put_unused_fd(new_fd);
return -XFS_ERROR(-PTR_ERR(filp));