Commit 72e31e5c authored by Andrew Morton's avatar Andrew Morton Committed by Russell King

[PATCH] Fix CIFS breakage from the statfs64 patch

From: Rene Scharfe <l.s.r@web.de>

cifs_statfs() is called with a pointer to a struct kstatfs, so let's
propagate this type into the helper function.
parent 7000fe76
...@@ -137,7 +137,7 @@ extern int get_dfs_path(int xid, struct cifsSesInfo *pSesInfo, ...@@ -137,7 +137,7 @@ extern int get_dfs_path(int xid, struct cifsSesInfo *pSesInfo,
const char *old_path, const struct nls_table *nls_codepage, const char *old_path, const struct nls_table *nls_codepage,
unsigned int *pnum_referrals, unsigned char ** preferrals); unsigned int *pnum_referrals, unsigned char ** preferrals);
extern int CIFSSMBQFSInfo(const int xid, struct cifsTconInfo *tcon, extern int CIFSSMBQFSInfo(const int xid, struct cifsTconInfo *tcon,
struct statfs *FSData, struct kstatfs *FSData,
const struct nls_table *nls_codepage); const struct nls_table *nls_codepage);
extern int CIFSSMBQFSAttributeInfo(const int xid, extern int CIFSSMBQFSAttributeInfo(const int xid,
struct cifsTconInfo *tcon, struct cifsTconInfo *tcon,
......
...@@ -1782,7 +1782,7 @@ CIFSGetDFSRefer(const int xid, struct cifsSesInfo *ses, ...@@ -1782,7 +1782,7 @@ CIFSGetDFSRefer(const int xid, struct cifsSesInfo *ses,
int int
CIFSSMBQFSInfo(const int xid, struct cifsTconInfo *tcon, CIFSSMBQFSInfo(const int xid, struct cifsTconInfo *tcon,
struct statfs *FSData, const struct nls_table *nls_codepage) struct kstatfs *FSData, const struct nls_table *nls_codepage)
{ {
/* level 0x103 SMB_QUERY_FILE_SYSTEM_INFO */ /* level 0x103 SMB_QUERY_FILE_SYSTEM_INFO */
TRANSACTION2_QFSI_REQ *pSMB = NULL; TRANSACTION2_QFSI_REQ *pSMB = NULL;
...@@ -1846,8 +1846,9 @@ CIFSSMBQFSInfo(const int xid, struct cifsTconInfo *tcon, ...@@ -1846,8 +1846,9 @@ CIFSSMBQFSInfo(const int xid, struct cifsTconInfo *tcon,
FSData->f_bfree = FSData->f_bavail = FSData->f_bfree = FSData->f_bavail =
le64_to_cpu(response_data->FreeAllocationUnits); le64_to_cpu(response_data->FreeAllocationUnits);
cFYI(1, cFYI(1,
("Blocks: %ld Free: %ld Block size %ld", ("Blocks: %lld Free: %lld Block size %ld",
FSData->f_blocks, FSData->f_bfree, (unsigned long long)FSData->f_blocks,
(unsigned long long)FSData->f_bfree,
FSData->f_bsize)); FSData->f_bsize));
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment