diff options
| author | Joel Becker <jlbec@evilplan.org> | 2011-03-28 18:44:26 +0200 |
|---|---|---|
| committer | Joel Becker <jlbec@evilplan.org> | 2011-03-28 18:44:26 +0200 |
| commit | 99bdc3880c611c7f2061fbd5372ef81b40217e26 (patch) | |
| tree | ef68a53e28e9ee53ce9db3642bab5fa5b3d44866 /fs/fat/inode.c | |
| parent | fs,ocfs2: Move o2net_get_func_run_time under CONFIG_OCFS2_FS_STATS. (diff) | |
| parent | ocfs2: Make the left masklogs compat. (diff) | |
| download | linux-99bdc3880c611c7f2061fbd5372ef81b40217e26.tar.xz linux-99bdc3880c611c7f2061fbd5372ef81b40217e26.zip | |
Merge branch 'mlog_replace_for_39' of git://repo.or.cz/taoma-kernel into ocfs2-merge-window-fix
Diffstat (limited to 'fs/fat/inode.c')
| -rw-r--r-- | fs/fat/inode.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/fat/inode.c b/fs/fat/inode.c index 86753fe10bd1..0e277ec4b612 100644 --- a/fs/fat/inode.c +++ b/fs/fat/inode.c @@ -757,8 +757,10 @@ fat_encode_fh(struct dentry *de, __u32 *fh, int *lenp, int connectable) struct inode *inode = de->d_inode; u32 ipos_h, ipos_m, ipos_l; - if (len < 5) + if (len < 5) { + *lenp = 5; return 255; /* no room */ + } ipos_h = MSDOS_I(inode)->i_pos >> 8; ipos_m = (MSDOS_I(inode)->i_pos & 0xf0) << 24; |