Commit c7425eb4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6 

* git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6:
  [CIFS] fix sparse warning
  cifs: fix sb->s_maxbytes so that it casts properly to a signed value
  cifs: disable serverino if server doesn't support it
parents 9e1b32ca f1230c97

fs/cifs/connect.c

+4 −4
Original line number Diff line number Diff line
@@ -2452,10 +2452,10 @@ cifs_mount(struct super_block *sb, struct cifs_sb_info *cifs_sb, 
		tcon->local_lease = volume_info->local_lease;

	}

	if (pSesInfo) {

		if (pSesInfo->capabilities & CAP_LARGE_FILES) {

			sb->s_maxbytes = (u64) 1 << 63;

		} else

			sb->s_maxbytes = (u64) 1 << 31;	/* 2 GB */

		if (pSesInfo->capabilities & CAP_LARGE_FILES)

			sb->s_maxbytes = MAX_LFS_FILESIZE;

		else

			sb->s_maxbytes = MAX_NON_LFS;

	}



	/* BB FIXME fix time_gran to be larger for LANMAN sessions */

fs/cifs/inode.c

+6 −3
Original line number Diff line number Diff line
@@ -212,7 +212,7 @@ cifs_unix_basic_to_fattr(struct cifs_fattr *fattr, FILE_UNIX_BASIC_INFO *info, 
 * junction to the new submount (ie to setup the fake directory

 * which represents a DFS referral).

 */

void

static void

cifs_create_dfs_fattr(struct cifs_fattr *fattr, struct super_block *sb)

{

	struct cifs_sb_info *cifs_sb = CIFS_SB(sb);
@@ -388,7 +388,7 @@ static int cifs_sfu_mode(struct cifs_fattr *fattr, const unsigned char *path, 
}



/* Fill a cifs_fattr struct with info from FILE_ALL_INFO */

void

static void

cifs_all_info_to_fattr(struct cifs_fattr *fattr, FILE_ALL_INFO *info,

		       struct cifs_sb_info *cifs_sb, bool adjust_tz)

{
@@ -513,9 +513,12 @@ int cifs_get_inode_info(struct inode **pinode, 
					cifs_sb->mnt_cifs_flags &

						CIFS_MOUNT_MAP_SPECIAL_CHR);

			if (rc1) {

				/* BB EOPNOSUPP disable SERVER_INUM? */

				cFYI(1, ("GetSrvInodeNum rc %d", rc1));

				fattr.cf_uniqueid = iunique(sb, ROOT_I);

				/* disable serverino if call not supported */

				if (rc1 == -EINVAL)

					cifs_sb->mnt_cifs_flags &=

							~CIFS_MOUNT_SERVER_INUM;

			}

		} else {

			fattr.cf_uniqueid = iunique(sb, ROOT_I);