Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
linux-davinci
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
linux
linux-davinci
Commits
65e67f51
Commit
65e67f51
authored
Apr 18, 2008
by
Lachlan McIlroy
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[XFS] Fix merge failure
parent
3b2816be
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
2 deletions
+4
-2
fs/xfs/linux-2.6/xfs_ioctl.c
fs/xfs/linux-2.6/xfs_ioctl.c
+4
-2
No files found.
fs/xfs/linux-2.6/xfs_ioctl.c
View file @
65e67f51
...
...
@@ -1090,10 +1090,12 @@ xfs_ioctl(
return
xfs_ioc_fsgetxattr
(
ip
,
0
,
arg
);
case
XFS_IOC_FSGETXATTRA
:
return
xfs_ioc_fsgetxattr
(
ip
,
1
,
arg
);
case
XFS_IOC_FSSETXATTR
:
return
xfs_ioc_fssetxattr
(
ip
,
filp
,
arg
);
case
XFS_IOC_GETXFLAGS
:
return
xfs_ioc_getxflags
(
ip
,
arg
);
case
XFS_IOC_SETXFLAGS
:
case
XFS_IOC_FSSETXATTR
:
return
xfs_ioc_xattr
(
ip
,
filp
,
cmd
,
arg
);
return
xfs_ioc_setxflags
(
ip
,
filp
,
arg
);
case
XFS_IOC_FSSETDM
:
{
struct
fsdmidata
dmi
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment