diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-04-14 08:50:37 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-04-14 08:51:07 +0200 |
| commit | a4c98f8bbeafee12c979c90743f6fda94f7515c7 (patch) | |
| tree | 3dda24b8a2ec42ab7b42845cb68c8b6e1b0d501f /fs/cifs/link.c | |
| parent | f4ad9bd208c98f32a6f9136618e0b8bebe3fb370 (diff) | |
| parent | 85f2e689a5c8fb6ed8fdbee00109e7f6e5fefcb6 (diff) | |
| download | talos-op-linux-a4c98f8bbeafee12c979c90743f6fda94f7515c7.tar.gz talos-op-linux-a4c98f8bbeafee12c979c90743f6fda94f7515c7.zip | |
Merge branch 'linus' into sched/locking
Merge reason: Pick up this upstream commit:
6631e635c65d: block: don't flush plugged IO on forced preemtion scheduling
As it modifies the scheduler and we'll queue up dependent patches.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'fs/cifs/link.c')
| -rw-r--r-- | fs/cifs/link.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/cifs/link.c b/fs/cifs/link.c index e8804d373404..ce417a9764a3 100644 --- a/fs/cifs/link.c +++ b/fs/cifs/link.c @@ -239,7 +239,7 @@ CIFSQueryMFSymLink(const int xid, struct cifsTconInfo *tcon, if (rc != 0) return rc; - if (file_info.EndOfFile != CIFS_MF_SYMLINK_FILE_SIZE) { + if (file_info.EndOfFile != cpu_to_le64(CIFS_MF_SYMLINK_FILE_SIZE)) { CIFSSMBClose(xid, tcon, netfid); /* it's not a symlink */ return -EINVAL; @@ -316,7 +316,7 @@ CIFSCheckMFSymlink(struct cifs_fattr *fattr, if (rc != 0) goto out; - if (file_info.EndOfFile != CIFS_MF_SYMLINK_FILE_SIZE) { + if (file_info.EndOfFile != cpu_to_le64(CIFS_MF_SYMLINK_FILE_SIZE)) { CIFSSMBClose(xid, pTcon, netfid); /* it's not a symlink */ goto out; |
